Update OpenSSL to 1.0.1d. Changes are far too numerous to list, the main one being

that we can now take advantage of AES-NI support in modern processors to significantly
increase performance.

Miscellaneous pkgsrc changes:

 - Remove unnecessary warning message on Solaris.
 - Fix RPATH for libgost.so.
 - MD2 support is optional, enabled by default for compatability.

1 files changed, 163 insertions, 6 deletions

diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 0c6901258c0..83d63d967af 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.17 2010/03/01 08:15:40 taca Exp $
+@comment $NetBSD: PLIST.common,v 1.18 2013/02/06 21:40:33 jperkin Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@@ -9,7 +9,10 @@ include/openssl/bio.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/buffer.h
+include/openssl/camellia.h
 include/openssl/cast.h
+include/openssl/cmac.h
+include/openssl/cms.h
 include/openssl/comp.h
 include/openssl/conf.h
 include/openssl/conf_api.h
@@ -33,10 +36,11 @@ ${PLIST.idea}include/openssl/idea.h
 include/openssl/krb5_asn.h
 include/openssl/kssl.h
 include/openssl/lhash.h
-include/openssl/md2.h
+${PLIST.md2}include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 ${PLIST.mdc2}include/openssl/mdc2.h
+include/openssl/modes.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/ocsp.h
@@ -47,7 +51,6 @@ include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pkcs12.h
 include/openssl/pkcs7.h
-include/openssl/pq_compat.h
 include/openssl/pqueue.h
 include/openssl/rand.h
 include/openssl/rc2.h
@@ -56,19 +59,22 @@ ${PLIST.rc5}include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
+include/openssl/seed.h
 include/openssl/sha.h
+include/openssl/srp.h
+include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl2.h
 include/openssl/ssl23.h
 include/openssl/ssl3.h
 include/openssl/stack.h
-include/openssl/store.h
 include/openssl/symhacks.h
 include/openssl/tls1.h
-include/openssl/tmdiff.h
+include/openssl/ts.h
 include/openssl/txt_db.h
 include/openssl/ui.h
 include/openssl/ui_compat.h
+include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
@@ -79,7 +85,9 @@ lib/engines/libcapi.so
 lib/engines/libchil.so
 lib/engines/libcswift.so
 lib/engines/libgmp.so
+lib/engines/libgost.so
 lib/engines/libnuron.so
+lib/engines/libpadlock.so
 lib/engines/libsureware.so
 lib/engines/libubsec.so
 lib/libcrypto.a
@@ -92,6 +100,7 @@ man/man1/openssl.1
 man/man1/openssl_asn1parse.1
 man/man1/openssl_ca.1
 man/man1/openssl_ciphers.1
+man/man1/openssl_cms.1
 man/man1/openssl_crl.1
 man/man1/openssl_crl2pkcs7.1
 man/man1/openssl_dgst.1
@@ -103,6 +112,7 @@ man/man1/openssl_ecparam.1
 man/man1/openssl_enc.1
 man/man1/openssl_errstr.1
 man/man1/openssl_gendsa.1
+man/man1/openssl_genpkey.1
 man/man1/openssl_genrsa.1
 man/man1/openssl_md2.1
 man/man1/openssl_md4.1
@@ -114,6 +124,9 @@ man/man1/openssl_passwd.1
 man/man1/openssl_pkcs12.1
 man/man1/openssl_pkcs7.1
 man/man1/openssl_pkcs8.1
+man/man1/openssl_pkey.1
+man/man1/openssl_pkeyparam.1
+man/man1/openssl_pkeyutl.1
 man/man1/openssl_rand.1
 man/man1/openssl_req.1
 man/man1/openssl_ripemd160.1
@@ -128,6 +141,8 @@ man/man1/openssl_sha1.1
 man/man1/openssl_smime.1
 man/man1/openssl_speed.1
 man/man1/openssl_spkac.1
+man/man1/openssl_ts.1
+man/man1/openssl_tsget.1
 man/man1/openssl_verify.1
 man/man1/openssl_version.1
 man/man1/openssl_x509.1
@@ -207,6 +222,7 @@ man/man3/BIO_gets.3
 man/man3/BIO_int_ctrl.3
 man/man3/BIO_make_bio_pair.3
 man/man3/BIO_new.3
+man/man3/BIO_new_CMS.3
 man/man3/BIO_new_bio_pair.3
 man/man3/BIO_new_buffer_ssl_connect.3
 man/man3/BIO_new_fd.3
@@ -374,11 +390,55 @@ man/man3/BUF_MEM_free.3
 man/man3/BUF_MEM_grow.3
 man/man3/BUF_MEM_new.3
 man/man3/BUF_strdup.3
+man/man3/CMS_ReceiptRequest_create0.3
+man/man3/CMS_ReceiptRequest_get0_values.3
+man/man3/CMS_RecipientInfo_decrypt.3
+man/man3/CMS_RecipientInfo_kekri_get0_id.3
+man/man3/CMS_RecipientInfo_kekri_id_cmp.3
+man/man3/CMS_RecipientInfo_ktri_cert_cmp.3
+man/man3/CMS_RecipientInfo_ktri_get0_signer_id.3
+man/man3/CMS_RecipientInfo_set0_key.3
+man/man3/CMS_RecipientInfo_set0_pkey.3
+man/man3/CMS_RecipientInfo_type.3
+man/man3/CMS_SignerInfo_cert_cmp.3
+man/man3/CMS_SignerInfo_get0_signer_id.3
+man/man3/CMS_SignerInfo_sign.3
+man/man3/CMS_add0_cert.3
+man/man3/CMS_add0_crl.3
+man/man3/CMS_add0_recipient_key.3
+man/man3/CMS_add1_ReceiptRequest.3
+man/man3/CMS_add1_cert.3
+man/man3/CMS_add1_recipient_cert.3
+man/man3/CMS_compress.3
+man/man3/CMS_decrypt.3
+man/man3/CMS_encrypt.3
+man/man3/CMS_final.3
+man/man3/CMS_get0_RecipientInfos.3
+man/man3/CMS_get0_SignerInfos.3
+man/man3/CMS_get0_eContentType.3
+man/man3/CMS_get0_type.3
+man/man3/CMS_get1_ReceiptRequest.3
+man/man3/CMS_get1_certs.3
+man/man3/CMS_get1_crls.3
+man/man3/CMS_set1_eContentType.3
+man/man3/CMS_set1_signer_certs.3
+man/man3/CMS_sign.3
+man/man3/CMS_sign_add1_signer.3
+man/man3/CMS_sign_receipt.3
+man/man3/CMS_uncompress.3
+man/man3/CMS_verify.3
+man/man3/CMS_verify_receipt.3
 man/man3/CONF_modules_finish.3
 man/man3/CONF_modules_free.3
 man/man3/CONF_modules_load.3
 man/man3/CONF_modules_load_file.3
 man/man3/CONF_modules_unload.3
+man/man3/CRYPTO_THREADID_cmp.3
+man/man3/CRYPTO_THREADID_cpy.3
+man/man3/CRYPTO_THREADID_current.3
+man/man3/CRYPTO_THREADID_get_callback.3
+man/man3/CRYPTO_THREADID_hash.3
+man/man3/CRYPTO_THREADID_set_callback.3
 man/man3/CRYPTO_destroy_dynlockid.3
 man/man3/CRYPTO_get_ex_data.3
 man/man3/CRYPTO_get_new_dynlockid.3
@@ -388,7 +448,6 @@ man/man3/CRYPTO_set_dynlock_create_callback.3
 man/man3/CRYPTO_set_dynlock_destroy_callback.3
 man/man3/CRYPTO_set_dynlock_lock_callback.3
 man/man3/CRYPTO_set_ex_data.3
-man/man3/CRYPTO_set_id_callback.3
 man/man3/CRYPTO_set_locking_callback.3
 man/man3/DES_cbc_cksum.3
 man/man3/DES_cfb64_encrypt.3
@@ -533,7 +592,13 @@ man/man3/EVP_DecryptUpdate.3
 man/man3/EVP_DigestFinal_ex.3
 man/man3/EVP_DigestInit.3
 man/man3/EVP_DigestInit_ex.3
+man/man3/EVP_DigestSignFinal.3
+man/man3/EVP_DigestSignInit.3
+man/man3/EVP_DigestSignUpdate.3
 man/man3/EVP_DigestUpdate.3
+man/man3/EVP_DigestVerifyFinal.3
+man/man3/EVP_DigestVerifyInit.3
+man/man3/EVP_DigestVerifyUpdate.3
 man/man3/EVP_EncryptFinal.3
 man/man3/EVP_EncryptFinal_ex.3
 man/man3/EVP_EncryptInit.3
@@ -557,21 +622,59 @@ man/man3/EVP_MD_type.3
 man/man3/EVP_OpenFinal.3
 man/man3/EVP_OpenInit.3
 man/man3/EVP_OpenUpdate.3
+man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3
+man/man3/EVP_PKEY_CTX_ctrl.3
+man/man3/EVP_PKEY_CTX_dup.3
+man/man3/EVP_PKEY_CTX_free.3
+man/man3/EVP_PKEY_CTX_get_app_data.3
+man/man3/EVP_PKEY_CTX_get_cb.3
+man/man3/EVP_PKEY_CTX_get_keygen_info.3
+man/man3/EVP_PKEY_CTX_new.3
+man/man3/EVP_PKEY_CTX_new_id.3
+man/man3/EVP_PKEY_CTX_set_cb.3
 man/man3/EVP_PKEY_assign_DH.3
 man/man3/EVP_PKEY_assign_DSA.3
 man/man3/EVP_PKEY_assign_EC_KEY.3
 man/man3/EVP_PKEY_assign_RSA.3
+man/man3/EVP_PKEY_cmp.3
+man/man3/EVP_PKEY_cmp_parameters.3
+man/man3/EVP_PKEY_copy_parameters.3
+man/man3/EVP_PKEY_ctrl.3
+man/man3/EVP_PKEY_ctrl_str.3
+man/man3/EVP_PKEY_decrypt.3
+man/man3/EVP_PKEY_decrypt_init.3
+man/man3/EVP_PKEY_derive.3
+man/man3/EVP_PKEY_derive_init.3
+man/man3/EVP_PKEY_derive_set_peer.3
+man/man3/EVP_PKEY_encrypt.3
+man/man3/EVP_PKEY_encrypt_init.3
 man/man3/EVP_PKEY_free.3
 man/man3/EVP_PKEY_get1_DH.3
 man/man3/EVP_PKEY_get1_DSA.3
 man/man3/EVP_PKEY_get1_EC_KEY.3
 man/man3/EVP_PKEY_get1_RSA.3
+man/man3/EVP_PKEY_get_default_digest.3
+man/man3/EVP_PKEY_get_default_digest_nid.3
+man/man3/EVP_PKEY_keygen.3
+man/man3/EVP_PKEY_keygen_init.3
+man/man3/EVP_PKEY_missing_parameters.3
 man/man3/EVP_PKEY_new.3
+man/man3/EVP_PKEY_paramgen.3
+man/man3/EVP_PKEY_paramgen_init.3
+man/man3/EVP_PKEY_print_params.3
+man/man3/EVP_PKEY_print_private.3
+man/man3/EVP_PKEY_print_public.3
 man/man3/EVP_PKEY_set1_DH.3
 man/man3/EVP_PKEY_set1_DSA.3
 man/man3/EVP_PKEY_set1_EC_KEY.3
 man/man3/EVP_PKEY_set1_RSA.3
+man/man3/EVP_PKEY_sign.3
+man/man3/EVP_PKEY_sign_init.3
 man/man3/EVP_PKEY_type.3
+man/man3/EVP_PKEY_verify.3
+man/man3/EVP_PKEY_verify_init.3
+man/man3/EVP_PKEY_verify_recover.3
+man/man3/EVP_PKEY_verify_recover_init.3
 man/man3/EVP_SealFinal.3
 man/man3/EVP_SealInit.3
 man/man3/EVP_SealUpdate.3
@@ -596,6 +699,10 @@ man/man3/EVP_mdc2.3
 man/man3/EVP_ripemd160.3
 man/man3/EVP_sha.3
 man/man3/EVP_sha1.3
+man/man3/EVP_sha224.3
+man/man3/EVP_sha256.3
+man/man3/EVP_sha384.3
+man/man3/EVP_sha512.3
 man/man3/HMAC.3
 man/man3/HMAC_Final.3
 man/man3/HMAC_Init.3
@@ -689,12 +796,14 @@ man/man3/PEM_write_X509_AUX.3
 man/man3/PEM_write_X509_CRL.3
 man/man3/PEM_write_X509_REQ.3
 man/man3/PEM_write_X509_REQ_NEW.3
+man/man3/PEM_write_bio_CMS_stream.3
 man/man3/PEM_write_bio_DHparams.3
 man/man3/PEM_write_bio_DSAPrivateKey.3
 man/man3/PEM_write_bio_DSA_PUBKEY.3
 man/man3/PEM_write_bio_DSAparams.3
 man/man3/PEM_write_bio_NETSCAPE_CERT_SEQUENCE.3
 man/man3/PEM_write_bio_PKCS7.3
+man/man3/PEM_write_bio_PKCS7_stream.3
 man/man3/PEM_write_bio_PKCS8PrivateKey.3
 man/man3/PEM_write_bio_PKCS8PrivateKey_nid.3
 man/man3/PEM_write_bio_PUBKEY.3
@@ -712,6 +821,7 @@ man/man3/PKCS12_parse.3
 man/man3/PKCS7_decrypt.3
 man/man3/PKCS7_encrypt.3
 man/man3/PKCS7_sign.3
+man/man3/PKCS7_sign_add_signer.3
 man/man3/PKCS7_verify.3
 man/man3/RAND_SSLeay.3
 man/man3/RAND_add.3
@@ -776,7 +886,9 @@ man/man3/SHA1.3
 man/man3/SHA1_Final.3
 man/man3/SHA1_Init.3
 man/man3/SHA1_Update.3
+man/man3/SMIME_read_CMS.3
 man/man3/SMIME_read_PKCS7.3
+man/man3/SMIME_write_CMS.3
 man/man3/SMIME_write_PKCS7.3
 man/man3/SSL.3
 man/man3/SSL_CIPHER_description.3
@@ -848,6 +960,8 @@ man/man3/SSL_CTX_set_mode.3
 man/man3/SSL_CTX_set_msg_callback.3
 man/man3/SSL_CTX_set_msg_callback_arg.3
 man/man3/SSL_CTX_set_options.3
+man/man3/SSL_CTX_set_psk_client_callback.3
+man/man3/SSL_CTX_set_psk_server_callback.3
 man/man3/SSL_CTX_set_quiet_shutdown.3
 man/man3/SSL_CTX_set_session_cache_mode.3
 man/man3/SSL_CTX_set_session_id_context.3
@@ -869,6 +983,7 @@ man/man3/SSL_CTX_use_certificate.3
 man/man3/SSL_CTX_use_certificate_ASN1.3
 man/man3/SSL_CTX_use_certificate_chain_file.3
 man/man3/SSL_CTX_use_certificate_file.3
+man/man3/SSL_CTX_use_psk_identity_hint.3
 man/man3/SSL_SESSION_free.3
 man/man3/SSL_SESSION_get_ex_data.3
 man/man3/SSL_SESSION_get_ex_new_index.3
@@ -916,6 +1031,8 @@ man/man3/SSL_get_msg_callback_arg.3
 man/man3/SSL_get_options.3
 man/man3/SSL_get_peer_cert_chain.3
 man/man3/SSL_get_peer_certificate.3
+man/man3/SSL_get_psk_identity.3
+man/man3/SSL_get_psk_identity_hint.3
 man/man3/SSL_get_quiet_shutdown.3
 man/man3/SSL_get_rbio.3
 man/man3/SSL_get_secure_renegotiation_support.3
@@ -951,6 +1068,8 @@ man/man3/SSL_set_max_cert_list.3
 man/man3/SSL_set_mode.3
 man/man3/SSL_set_msg_callback.3
 man/man3/SSL_set_options.3
+man/man3/SSL_set_psk_client_callback.3
+man/man3/SSL_set_psk_server_callback.3
 man/man3/SSL_set_quiet_shutdown.3
 man/man3/SSL_set_session.3
 man/man3/SSL_set_session_id_context.3
@@ -975,6 +1094,7 @@ man/man3/SSL_use_RSAPrivateKey_file.3
 man/man3/SSL_use_certificate.3
 man/man3/SSL_use_certificate_ASN1.3
 man/man3/SSL_use_certificate_file.3
+man/man3/SSL_use_psk_identity_hint.3
 man/man3/SSL_want.3
 man/man3/SSL_want_nothing.3
 man/man3/SSL_want_read.3
@@ -1030,8 +1150,42 @@ man/man3/X509_NAME_oneline.3
 man/man3/X509_NAME_print.3
 man/man3/X509_NAME_print_ex.3
 man/man3/X509_NAME_print_ex_fp.3
+man/man3/X509_STORE_CTX_cleanup.3
+man/man3/X509_STORE_CTX_free.3
+man/man3/X509_STORE_CTX_get0_param.3
+man/man3/X509_STORE_CTX_get1_chain.3
+man/man3/X509_STORE_CTX_get_current_cert.3
+man/man3/X509_STORE_CTX_get_error.3
+man/man3/X509_STORE_CTX_get_error_depth.3
+man/man3/X509_STORE_CTX_get_ex_data.3
+man/man3/X509_STORE_CTX_get_ex_new_index.3
+man/man3/X509_STORE_CTX_init.3
+man/man3/X509_STORE_CTX_new.3
+man/man3/X509_STORE_CTX_set0_crls.3
+man/man3/X509_STORE_CTX_set0_param.3
+man/man3/X509_STORE_CTX_set_cert.3
+man/man3/X509_STORE_CTX_set_chain.3
+man/man3/X509_STORE_CTX_set_default.3
+man/man3/X509_STORE_CTX_set_error.3
+man/man3/X509_STORE_CTX_set_ex_data.3
+man/man3/X509_STORE_CTX_set_verify_cb.3
+man/man3/X509_STORE_CTX_trusted_stack.3
+man/man3/X509_STORE_set_verify_cb.3
+man/man3/X509_STORE_set_verify_cb_func.3
+man/man3/X509_VERIFY_PARAM_add0_policy.3
+man/man3/X509_VERIFY_PARAM_clear_flags.3
+man/man3/X509_VERIFY_PARAM_get_depth.3
+man/man3/X509_VERIFY_PARAM_get_flags.3
+man/man3/X509_VERIFY_PARAM_set1_policies.3
+man/man3/X509_VERIFY_PARAM_set_depth.3
+man/man3/X509_VERIFY_PARAM_set_flags.3
+man/man3/X509_VERIFY_PARAM_set_purpose.3
+man/man3/X509_VERIFY_PARAM_set_time.3
+man/man3/X509_VERIFY_PARAM_set_trust.3
 man/man3/X509_free.3
 man/man3/X509_new.3
+man/man3/X509_verify_cert.3
+man/man3/X509_verify_cert_error_string.3
 man/man3/bn_add_words.3
 man/man3/bn_check_top.3
 man/man3/bn_cmp_words.3
@@ -1093,12 +1247,14 @@ man/man3/des_read_password.3
 man/man3/des_read_pw.3
 man/man3/des_read_pw_string.3
 man/man3/i2d_ASN1_OBJECT.3
+man/man3/i2d_CMS_bio_stream.3
 man/man3/i2d_DHparams.3
 man/man3/i2d_DSAPrivateKey.3
 man/man3/i2d_DSAPublicKey.3
 man/man3/i2d_DSA_PUBKEY.3
 man/man3/i2d_DSA_SIG.3
 man/man3/i2d_Netscape_RSA.3
+man/man3/i2d_PKCS7_bio_stream.3
 man/man3/i2d_PKCS8PrivateKey_bio.3
 man/man3/i2d_PKCS8PrivateKey_fp.3
 man/man3/i2d_PKCS8PrivateKey_nid_bio.3
@@ -1170,3 +1326,4 @@ share/examples/openssl/c_info
 share/examples/openssl/c_issuer
 share/examples/openssl/c_name
 share/examples/openssl/openssl.cnf
+share/examples/openssl/tsget