Changes 1.0.2:

Suite B support for TLS 1.2 and DTLS 1.2
Support for DTLS 1.2
TLS automatic EC curve selection.
API to set TLS supported signature algorithms and curves
SSL_CONF configuration API.
TLS Brainpool support.
ALPN support.
CMS support for RSA-PSS, RSA-OAEP, ECDH and X9.42 DH.

6 files changed, 326 insertions, 77 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index bf096542b28..d7ef913a032 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.201 2015/01/08 16:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.202 2015/02/12 13:08:53 adam Exp $
 
-DISTNAME=	openssl-1.0.1k
-MASTER_SITES=	http://ftp.openssl.org/source/
+DISTNAME=	openssl-1.0.2
 CATEGORIES=	security
+MASTER_SITES=	http://ftp.openssl.org/source/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openssl.org/
@@ -26,9 +26,9 @@ MAKE_JOBS_SAFE=		no
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--install_prefix=${DESTDIR}
-CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	shared no-fips
 
 .if ${OPSYS} == "SunOS"
@@ -87,31 +87,27 @@ SUBST_FILES.dl=		Makefile apps/Makefile crypto/Makefile \
 SUBST_SED.dl=		-e 's,^EX_LIBS=,EX_LIBS=${DL_LDFLAGS:Q} ,g'
 
 .elif ${OPSYS} == "AIX"
-CONFIGURE_SCRIPT=      ./Configure
-.if defined(ABI) && ${ABI} == "64"
-.if !empty(CC_VERSION:Mgcc*)
-CONFIGURE_ARGS+=       aix64-gcc
-.else
-CONFIGURE_ARGS+=       aix64-cc
-.endif
-.else
-.if !empty(CC_VERSION:Mgcc*)
-CONFIGURE_ARGS+=       aix-gcc
-.else
-CONFIGURE_ARGS+=       aix-cc
-.endif
-.endif
+CONFIGURE_SCRIPT=	./Configure
+.  if defined(ABI) && ${ABI} == "64"
+.    if !empty(CC_VERSION:Mgcc*)
+CONFIGURE_ARGS+=	aix64-gcc
+.    else
+CONFIGURE_ARGS+=	aix64-cc
+.    endif
+.  else
+.    if !empty(CC_VERSION:Mgcc*)
+CONFIGURE_ARGS+=	aix-gcc
+.    else
+CONFIGURE_ARGS+=	aix-cc
+.    endif
+.  endif
 .elif ${OPSYS} == "Interix"
-
 SUBST_CLASSES+=		soname
 SUBST_STAGE.soname=	post-configure
 SUBST_FILES.soname=	Makefile.shared
 SUBST_SED.soname=	-e 's/-Wl,-soname=/-Wl,-h,/g'
-
 .elif ${OPSYS} == "HPUX"
-
 CONFIGURE_SCRIPT=	./Configure
-
 .  if ${ABI} == "64"
 .    if ${MACHINE_ARCH} == "hppa"
 CONFIGURE_ARGS+=	hpux64-parisc2-${CC}
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 8812a9c7b51..2bafb0e7846 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.21 2014/10/15 19:55:53 jperkin Exp $
+@comment $NetBSD: PLIST.common,v 1.22 2015/02/12 13:08:53 adam Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@@ -161,11 +161,14 @@ man/man3/ASN1_STRING_free.3
 man/man3/ASN1_STRING_length.3
 man/man3/ASN1_STRING_length_set.3
 man/man3/ASN1_STRING_new.3
+man/man3/ASN1_STRING_print.3
 man/man3/ASN1_STRING_print_ex.3
 man/man3/ASN1_STRING_print_ex_fp.3
 man/man3/ASN1_STRING_set.3
+man/man3/ASN1_STRING_to_UTF8.3
 man/man3/ASN1_STRING_type.3
 man/man3/ASN1_STRING_type_new.3
+man/man3/ASN1_add_oid_module.3
 man/man3/ASN1_generate_nconf.3
 man/man3/ASN1_generate_v3.3
 man/man3/BF_cbc_encrypt.3
@@ -227,10 +230,13 @@ man/man3/BIO_get_write_guarantee.3
 man/man3/BIO_gets.3
 man/man3/BIO_int_ctrl.3
 man/man3/BIO_make_bio_pair.3
+man/man3/BIO_method_type.3
 man/man3/BIO_new.3
 man/man3/BIO_new_CMS.3
+man/man3/BIO_new_accept.3
 man/man3/BIO_new_bio_pair.3
 man/man3/BIO_new_buffer_ssl_connect.3
+man/man3/BIO_new_connect.3
 man/man3/BIO_new_fd.3
 man/man3/BIO_new_file.3
 man/man3/BIO_new_fp.3
@@ -306,6 +312,7 @@ man/man3/BN_BLINDING_invert_ex.3
 man/man3/BN_BLINDING_new.3
 man/man3/BN_BLINDING_set_flags.3
 man/man3/BN_BLINDING_set_thread_id.3
+man/man3/BN_BLINDING_thread_id.3
 man/man3/BN_BLINDING_update.3
 man/man3/BN_CTX_end.3
 man/man3/BN_CTX_free.3
@@ -313,6 +320,9 @@ man/man3/BN_CTX_get.3
 man/man3/BN_CTX_init.3
 man/man3/BN_CTX_new.3
 man/man3/BN_CTX_start.3
+man/man3/BN_GENCB_call.3
+man/man3/BN_GENCB_set.3
+man/man3/BN_GENCB_set_old.3
 man/man3/BN_MONT_CTX_copy.3
 man/man3/BN_MONT_CTX_free.3
 man/man3/BN_MONT_CTX_init.3
@@ -344,6 +354,7 @@ man/man3/BN_free.3
 man/man3/BN_from_montgomery.3
 man/man3/BN_gcd.3
 man/man3/BN_generate_prime.3
+man/man3/BN_generate_prime_ex.3
 man/man3/BN_get_word.3
 man/man3/BN_hex2bn.3
 man/man3/BN_init.3
@@ -351,7 +362,9 @@ man/man3/BN_is_bit_set.3
 man/man3/BN_is_odd.3
 man/man3/BN_is_one.3
 man/man3/BN_is_prime.3
+man/man3/BN_is_prime_ex.3
 man/man3/BN_is_prime_fasttest.3
+man/man3/BN_is_prime_fasttest_ex.3
 man/man3/BN_is_word.3
 man/man3/BN_is_zero.3
 man/man3/BN_lshift.3
@@ -379,7 +392,9 @@ man/man3/BN_one.3
 man/man3/BN_print.3
 man/man3/BN_print_fp.3
 man/man3/BN_pseudo_rand.3
+man/man3/BN_pseudo_rand_range.3
 man/man3/BN_rand.3
+man/man3/BN_rand_range.3
 man/man3/BN_rshift.3
 man/man3/BN_rshift1.3
 man/man3/BN_set_bit.3
@@ -399,6 +414,7 @@ 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_encrypt.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
@@ -407,6 +423,7 @@ 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_signature.3
 man/man3/CMS_SignerInfo_get0_signer_id.3
 man/man3/CMS_SignerInfo_sign.3
 man/man3/CMS_add0_cert.3
@@ -414,6 +431,7 @@ 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_crl.3
 man/man3/CMS_add1_recipient_cert.3
 man/man3/CMS_add1_signer.3
 man/man3/CMS_compress.3
@@ -423,12 +441,13 @@ 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_signers.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_set1_signer_cert.3
 man/man3/CMS_sign.3
 man/man3/CMS_sign_receipt.3
 man/man3/CMS_uncompress.3
@@ -493,6 +512,7 @@ man/man3/DH_compute_key.3
 man/man3/DH_free.3
 man/man3/DH_generate_key.3
 man/man3/DH_generate_parameters.3
+man/man3/DH_generate_parameters_ex.3
 man/man3/DH_get_default_method.3
 man/man3/DH_get_ex_data.3
 man/man3/DH_get_ex_new_index.3
@@ -513,6 +533,7 @@ man/man3/DSA_dup_DH.3
 man/man3/DSA_free.3
 man/man3/DSA_generate_key.3
 man/man3/DSA_generate_parameters.3
+man/man3/DSA_generate_parameters_ex.3
 man/man3/DSA_get_default_method.3
 man/man3/DSA_get_ex_data.3
 man/man3/DSA_get_ex_new_index.3
@@ -529,6 +550,120 @@ man/man3/DSA_size.3
 man/man3/DSA_verify.3
 man/man3/DSAparams_print.3
 man/man3/DSAparams_print_fp.3
+man/man3/ECDSA_SIG_free.3
+man/man3/ECDSA_SIG_new.3
+man/man3/ECDSA_do_sign.3
+man/man3/ECDSA_do_sign_ex.3
+man/man3/ECDSA_do_verify.3
+man/man3/ECDSA_sign.3
+man/man3/ECDSA_sign_ex.3
+man/man3/ECDSA_sign_setup.3
+man/man3/ECDSA_size.3
+man/man3/ECDSA_verify.3
+man/man3/ECPKParameters_print.3
+man/man3/ECPKParameters_print_fp.3
+man/man3/EC_GF2m_simple_method.3
+man/man3/EC_GFp_mont_method.3
+man/man3/EC_GFp_nist_method.3
+man/man3/EC_GFp_nistp224_method.3
+man/man3/EC_GFp_nistp256_method.3
+man/man3/EC_GFp_nistp521_method.3
+man/man3/EC_GFp_simple_method.3
+man/man3/EC_GROUP_check.3
+man/man3/EC_GROUP_check_discriminant.3
+man/man3/EC_GROUP_clear_free.3
+man/man3/EC_GROUP_cmp.3
+man/man3/EC_GROUP_copy.3
+man/man3/EC_GROUP_dup.3
+man/man3/EC_GROUP_free.3
+man/man3/EC_GROUP_get0_generator.3
+man/man3/EC_GROUP_get0_seed.3
+man/man3/EC_GROUP_get_asn1_flag.3
+man/man3/EC_GROUP_get_basis_type.3
+man/man3/EC_GROUP_get_cofactor.3
+man/man3/EC_GROUP_get_curve_GF2m.3
+man/man3/EC_GROUP_get_curve_GFp.3
+man/man3/EC_GROUP_get_curve_name.3
+man/man3/EC_GROUP_get_degree.3
+man/man3/EC_GROUP_get_order.3
+man/man3/EC_GROUP_get_pentanomial_basis.3
+man/man3/EC_GROUP_get_point_conversion_form.3
+man/man3/EC_GROUP_get_seed_len.3
+man/man3/EC_GROUP_get_trinomial_basis.3
+man/man3/EC_GROUP_have_precompute_mult.3
+man/man3/EC_GROUP_method_of.3
+man/man3/EC_GROUP_new.3
+man/man3/EC_GROUP_new_by_curve_name.3
+man/man3/EC_GROUP_new_curve_GF2m.3
+man/man3/EC_GROUP_new_curve_GFp.3
+man/man3/EC_GROUP_precompute_mult.3
+man/man3/EC_GROUP_set_asn1_flag.3
+man/man3/EC_GROUP_set_curve_GF2m.3
+man/man3/EC_GROUP_set_curve_GFp.3
+man/man3/EC_GROUP_set_curve_name.3
+man/man3/EC_GROUP_set_generator.3
+man/man3/EC_GROUP_set_point_conversion_form.3
+man/man3/EC_GROUP_set_seed.3
+man/man3/EC_KEY_check_key.3
+man/man3/EC_KEY_clear_flags.3
+man/man3/EC_KEY_copy.3
+man/man3/EC_KEY_dup.3
+man/man3/EC_KEY_free.3
+man/man3/EC_KEY_generate_key.3
+man/man3/EC_KEY_get0_group.3
+man/man3/EC_KEY_get0_private_key.3
+man/man3/EC_KEY_get0_public_key.3
+man/man3/EC_KEY_get_conv_form.3
+man/man3/EC_KEY_get_enc_flags.3
+man/man3/EC_KEY_get_flags.3
+man/man3/EC_KEY_get_key_method_data.3
+man/man3/EC_KEY_insert_key_method_data.3
+man/man3/EC_KEY_new.3
+man/man3/EC_KEY_new_by_curve_name.3
+man/man3/EC_KEY_precompute_mult.3
+man/man3/EC_KEY_set_asn1_flag.3
+man/man3/EC_KEY_set_conv_form.3
+man/man3/EC_KEY_set_enc_flags.3
+man/man3/EC_KEY_set_flags.3
+man/man3/EC_KEY_set_group.3
+man/man3/EC_KEY_set_private_key.3
+man/man3/EC_KEY_set_public_key.3
+man/man3/EC_KEY_set_public_key_affine_coordinates.3
+man/man3/EC_KEY_up_ref.3
+man/man3/EC_METHOD_get_field_type.3
+man/man3/EC_POINT_add.3
+man/man3/EC_POINT_bn2point.3
+man/man3/EC_POINT_clear_free.3
+man/man3/EC_POINT_cmp.3
+man/man3/EC_POINT_copy.3
+man/man3/EC_POINT_dbl.3
+man/man3/EC_POINT_dup.3
+man/man3/EC_POINT_free.3
+man/man3/EC_POINT_get_Jprojective_coordinates_GFp.3
+man/man3/EC_POINT_get_affine_coordinates_GF2m.3
+man/man3/EC_POINT_get_affine_coordinates_GFp.3
+man/man3/EC_POINT_hex2point.3
+man/man3/EC_POINT_invert.3
+man/man3/EC_POINT_is_at_infinity.3
+man/man3/EC_POINT_is_on_curve.3
+man/man3/EC_POINT_make_affine.3
+man/man3/EC_POINT_method_of.3
+man/man3/EC_POINT_mul.3
+man/man3/EC_POINT_new.3
+man/man3/EC_POINT_oct2point.3
+man/man3/EC_POINT_point2bn.3
+man/man3/EC_POINT_point2hex.3
+man/man3/EC_POINT_point2oct.3
+man/man3/EC_POINT_set_Jprojective_coordinates.3
+man/man3/EC_POINT_set_affine_coordinates_GF2m.3
+man/man3/EC_POINT_set_affine_coordinates_GFp.3
+man/man3/EC_POINT_set_compressed_coordinates_GF2m.3
+man/man3/EC_POINT_set_compressed_coordinates_GFp.3
+man/man3/EC_POINT_set_to_infinity.3
+man/man3/EC_POINTs_make_affine.3
+man/man3/EC_POINTs_mul.3
+man/man3/EC_get_builtin_curves.3
+man/man3/ENGINE_add_conf_module.3
 man/man3/ERR_GET_FUNC.3
 man/man3/ERR_GET_LIB.3
 man/man3/ERR_GET_REASON.3
@@ -559,6 +694,7 @@ man/man3/ERR_print_errors_fp.3
 man/man3/ERR_put_error.3
 man/man3/ERR_reason_error_string.3
 man/man3/ERR_remove_state.3
+man/man3/ERR_remove_thread_state.3
 man/man3/ERR_set_mark.3
 man/man3/EVP_BytesToKey.3
 man/man3/EVP_CIPHER_CTX_block_size.3
@@ -595,6 +731,7 @@ man/man3/EVP_DecryptFinal_ex.3
 man/man3/EVP_DecryptInit.3
 man/man3/EVP_DecryptInit_ex.3
 man/man3/EVP_DecryptUpdate.3
+man/man3/EVP_DigestFinal.3
 man/man3/EVP_DigestFinal_ex.3
 man/man3/EVP_DigestInit.3
 man/man3/EVP_DigestInit_ex.3
@@ -630,6 +767,7 @@ 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_ctrl_str.3
 man/man3/EVP_PKEY_CTX_dup.3
 man/man3/EVP_PKEY_CTX_free.3
 man/man3/EVP_PKEY_CTX_get_app_data.3
@@ -638,6 +776,15 @@ 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_CTX_set_dh_paramgen_generator.3
+man/man3/EVP_PKEY_CTX_set_dh_paramgen_prime_len.3
+man/man3/EVP_PKEY_CTX_set_dsa_paramgen_bits.3
+man/man3/EVP_PKEY_CTX_set_ec_paramgen_curve_nid.3
+man/man3/EVP_PKEY_CTX_set_rsa_keygen_pubexp.3
+man/man3/EVP_PKEY_CTX_set_rsa_padding.3
+man/man3/EVP_PKEY_CTX_set_rsa_pss_saltlen.3
+man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3
+man/man3/EVP_PKEY_CTX_set_signature_md.3
 man/man3/EVP_PKEY_assign_DH.3
 man/man3/EVP_PKEY_assign_DSA.3
 man/man3/EVP_PKEY_assign_EC_KEY.3
@@ -645,8 +792,6 @@ 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
@@ -690,18 +835,63 @@ man/man3/EVP_SignUpdate.3
 man/man3/EVP_VerifyFinal.3
 man/man3/EVP_VerifyInit.3
 man/man3/EVP_VerifyUpdate.3
+man/man3/EVP_aes_128_ccm.3
+man/man3/EVP_aes_128_gcm.3
+man/man3/EVP_aes_192_ccm.3
+man/man3/EVP_aes_192_gcm.3
+man/man3/EVP_aes_256_ccm.3
+man/man3/EVP_aes_256_gcm.3
+man/man3/EVP_bf_cbc.3
+man/man3/EVP_bf_cfb.3
+man/man3/EVP_bf_ecb.3
+man/man3/EVP_bf_ofb.3
+man/man3/EVP_cast5_cbc.3
+man/man3/EVP_cast5_cfb.3
+man/man3/EVP_cast5_ecb.3
+man/man3/EVP_cast5_ofb.3
+man/man3/EVP_cleanup.3
+man/man3/EVP_des_cbc.3
+man/man3/EVP_des_cfb.3
+man/man3/EVP_des_ecb.3
+man/man3/EVP_des_ede.3
+man/man3/EVP_des_ede3.3
+man/man3/EVP_des_ede3_cbc.3
+man/man3/EVP_des_ede3_cfb.3
+man/man3/EVP_des_ede3_ofb.3
+man/man3/EVP_des_ede_cbc.3
+man/man3/EVP_des_ede_cfb.3
+man/man3/EVP_des_ede_ofb.3
+man/man3/EVP_des_ofb.3
+man/man3/EVP_desx_cbc.3
 man/man3/EVP_dss.3
 man/man3/EVP_dss1.3
+man/man3/EVP_enc_null.3
 man/man3/EVP_get_cipherbyname.3
 man/man3/EVP_get_cipherbynid.3
 man/man3/EVP_get_cipherbyobj.3
 man/man3/EVP_get_digestbyname.3
 man/man3/EVP_get_digestbynid.3
 man/man3/EVP_get_digestbyobj.3
+man/man3/EVP_idea_cbc.3
+man/man3/EVP_idea_cfb.3
+man/man3/EVP_idea_ecb.3
+man/man3/EVP_idea_ofb.3
 man/man3/EVP_md2.3
 man/man3/EVP_md5.3
 man/man3/EVP_md_null.3
 man/man3/EVP_mdc2.3
+man/man3/EVP_rc2_40_cbc.3
+man/man3/EVP_rc2_64_cbc.3
+man/man3/EVP_rc2_cbc.3
+man/man3/EVP_rc2_cfb.3
+man/man3/EVP_rc2_ecb.3
+man/man3/EVP_rc2_ofb.3
+man/man3/EVP_rc4.3
+man/man3/EVP_rc4_40.3
+man/man3/EVP_rc5_32_12_16_cbc.3
+man/man3/EVP_rc5_32_12_16_cfb.3
+man/man3/EVP_rc5_32_12_16_ecb.3
+man/man3/EVP_rc5_32_12_16_ofb.3
 man/man3/EVP_ripemd160.3
 man/man3/EVP_sha.3
 man/man3/EVP_sha1.3
@@ -710,8 +900,11 @@ man/man3/EVP_sha256.3
 man/man3/EVP_sha384.3
 man/man3/EVP_sha512.3
 man/man3/HMAC.3
+man/man3/HMAC_CTX_cleanup.3
+man/man3/HMAC_CTX_init.3
 man/man3/HMAC_Final.3
 man/man3/HMAC_Init.3
+man/man3/HMAC_Init_ex.3
 man/man3/HMAC_Update.3
 man/man3/HMAC_cleanup.3
 man/man3/MD2.3
@@ -747,6 +940,9 @@ man/man3/OPENSSL_Applink.3
 man/man3/OPENSSL_VERSION_NUMBER.3
 man/man3/OPENSSL_config.3
 man/man3/OPENSSL_ia32cap.3
+man/man3/OPENSSL_ia32cap_loc.3
+man/man3/OPENSSL_instrument_bus.3
+man/man3/OPENSSL_instrument_bus2.3
 man/man3/OPENSSL_load_builtin_modules.3
 man/man3/OPENSSL_no_config.3
 man/man3/OpenSSL_add_all_algorithms.3
@@ -826,6 +1022,7 @@ man/man3/PKCS12_create.3
 man/man3/PKCS12_parse.3
 man/man3/PKCS7_decrypt.3
 man/man3/PKCS7_encrypt.3
+man/man3/PKCS7_get0_signers.3
 man/man3/PKCS7_sign.3
 man/man3/PKCS7_sign_add_signer.3
 man/man3/PKCS7_verify.3
@@ -834,11 +1031,13 @@ man/man3/RAND_add.3
 man/man3/RAND_bytes.3
 man/man3/RAND_cleanup.3
 man/man3/RAND_egd.3
+man/man3/RAND_egd_bytes.3
 man/man3/RAND_event.3
 man/man3/RAND_file_name.3
 man/man3/RAND_get_rand_method.3
 man/man3/RAND_load_file.3
 man/man3/RAND_pseudo_bytes.3
+man/man3/RAND_query_egd_bytes.3
 man/man3/RAND_screen.3
 man/man3/RAND_seed.3
 man/man3/RAND_set_rand_method.3
@@ -857,6 +1056,7 @@ man/man3/RSA_check_key.3
 man/man3/RSA_flags.3
 man/man3/RSA_free.3
 man/man3/RSA_generate_key.3
+man/man3/RSA_generate_key_ex.3
 man/man3/RSA_get_default_method.3
 man/man3/RSA_get_ex_data.3
 man/man3/RSA_get_ex_new_index.3
@@ -902,15 +1102,31 @@ man/man3/SSL_CIPHER_get_bits.3
 man/man3/SSL_CIPHER_get_name.3
 man/man3/SSL_CIPHER_get_version.3
 man/man3/SSL_COMP_add_compression_method.3
+man/man3/SSL_CONF_CTX_clear_flags.3
+man/man3/SSL_CONF_CTX_free.3
+man/man3/SSL_CONF_CTX_new.3
+man/man3/SSL_CONF_CTX_set1_prefix.3
+man/man3/SSL_CONF_CTX_set_flags.3
+man/man3/SSL_CONF_CTX_set_ssl.3
+man/man3/SSL_CONF_CTX_set_ssl_ctx.3
+man/man3/SSL_CONF_cmd.3
+man/man3/SSL_CONF_cmd_argv.3
+man/man3/SSL_CTX_add0_chain_cert.3
+man/man3/SSL_CTX_add1_chain_cert.3
 man/man3/SSL_CTX_add_client_CA.3
+man/man3/SSL_CTX_add_client_custom_ext.3
 man/man3/SSL_CTX_add_extra_chain_cert.3
+man/man3/SSL_CTX_add_server_custom_ext.3
 man/man3/SSL_CTX_add_session.3
+man/man3/SSL_CTX_build_cert_chain.3
 man/man3/SSL_CTX_callback_ctrl.3
 man/man3/SSL_CTX_check_private_key.3
+man/man3/SSL_CTX_clear_chain_certs.3
 man/man3/SSL_CTX_clear_options.3
 man/man3/SSL_CTX_ctrl.3
 man/man3/SSL_CTX_flush_sessions.3
 man/man3/SSL_CTX_free.3
+man/man3/SSL_CTX_get0_chain_certs.3
 man/man3/SSL_CTX_get_cert_store.3
 man/man3/SSL_CTX_get_client_CA_list.3
 man/man3/SSL_CTX_get_client_cert_cb.3
@@ -930,6 +1146,7 @@ man/man3/SSL_CTX_load_verify_locations.3
 man/man3/SSL_CTX_need_tmp_rsa.3
 man/man3/SSL_CTX_new.3
 man/man3/SSL_CTX_remove_session.3
+man/man3/SSL_CTX_select_current_cert.3
 man/man3/SSL_CTX_sess_accept.3
 man/man3/SSL_CTX_sess_accept_good.3
 man/man3/SSL_CTX_sess_accept_renegotiate.3
@@ -951,13 +1168,25 @@ man/man3/SSL_CTX_sess_set_new_cb.3
 man/man3/SSL_CTX_sess_set_remove_cb.3
 man/man3/SSL_CTX_sess_timeouts.3
 man/man3/SSL_CTX_sessions.3
+man/man3/SSL_CTX_set0_chain.3
+man/man3/SSL_CTX_set0_chain_cert_store.3
+man/man3/SSL_CTX_set0_verify_cert_store.3
+man/man3/SSL_CTX_set1_chain.3
+man/man3/SSL_CTX_set1_chain_cert_store.3
+man/man3/SSL_CTX_set1_curves.3
+man/man3/SSL_CTX_set1_curves_list.3
+man/man3/SSL_CTX_set1_verify_cert_store.3
+man/man3/SSL_CTX_set_cert_cb.3
 man/man3/SSL_CTX_set_cert_store.3
 man/man3/SSL_CTX_set_cert_verify_callback.3
 man/man3/SSL_CTX_set_cipher_list.3
 man/man3/SSL_CTX_set_client_CA_list.3
 man/man3/SSL_CTX_set_client_cert_cb.3
+man/man3/SSL_CTX_set_current_cert.3
+man/man3/SSL_CTX_set_custom_cli_ext.3
 man/man3/SSL_CTX_set_default_passwd_cb.3
 man/man3/SSL_CTX_set_default_passwd_cb_userdata.3
+man/man3/SSL_CTX_set_ecdh_auto.3
 man/man3/SSL_CTX_set_ex_data.3
 man/man3/SSL_CTX_set_generate_session_id.3
 man/man3/SSL_CTX_set_info_callback.3
@@ -991,6 +1220,7 @@ 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_CTX_use_serverinfo.3
 man/man3/SSL_SESSION_free.3
 man/man3/SSL_SESSION_get_ex_data.3
 man/man3/SSL_SESSION_get_ex_new_index.3
@@ -1000,21 +1230,27 @@ man/man3/SSL_SESSION_set_ex_data.3
 man/man3/SSL_SESSION_set_time.3
 man/man3/SSL_SESSION_set_timeout.3
 man/man3/SSL_accept.3
+man/man3/SSL_add0_chain_cert.3
+man/man3/SSL_add1_chain_cert.3
 man/man3/SSL_add_client_CA.3
 man/man3/SSL_add_session.3
 man/man3/SSL_alert_desc_string.3
 man/man3/SSL_alert_desc_string_long.3
 man/man3/SSL_alert_type_string.3
 man/man3/SSL_alert_type_string_long.3
+man/man3/SSL_build_cert_chain.3
 man/man3/SSL_callback_ctrl.3
 man/man3/SSL_check_private_key.3
 man/man3/SSL_clear.3
+man/man3/SSL_clear_chain_certs.3
 man/man3/SSL_clear_options.3
 man/man3/SSL_connect.3
 man/man3/SSL_ctrl.3
 man/man3/SSL_do_handshake.3
 man/man3/SSL_flush_sessions.3
 man/man3/SSL_free.3
+man/man3/SSL_get0_chain_certs.3
+man/man3/SSL_get1_curves.3
 man/man3/SSL_get_SSL_CTX.3
 man/man3/SSL_get_accept_state.3
 man/man3/SSL_get_cipher.3
@@ -1044,6 +1280,7 @@ man/man3/SSL_get_quiet_shutdown.3
 man/man3/SSL_get_rbio.3
 man/man3/SSL_get_secure_renegotiation_support.3
 man/man3/SSL_get_session.3
+man/man3/SSL_get_shared_curve.3
 man/man3/SSL_get_shutdown.3
 man/man3/SSL_get_ssl_method.3
 man/man3/SSL_get_verify_callback.3
@@ -1062,11 +1299,23 @@ man/man3/SSL_read.3
 man/man3/SSL_remove_session.3
 man/man3/SSL_rstate_string.3
 man/man3/SSL_rstate_string_long.3
+man/man3/SSL_select_current_cert.3
 man/man3/SSL_session_reused.3
+man/man3/SSL_set0_chain.3
+man/man3/SSL_set0_chain_cert_store.3
+man/man3/SSL_set0_verify_cert_store.3
+man/man3/SSL_set1_chain.3
+man/man3/SSL_set1_chain_cert_store.3
+man/man3/SSL_set1_curves.3
+man/man3/SSL_set1_curves_list.3
+man/man3/SSL_set1_verify_cert_store.3
 man/man3/SSL_set_bio.3
+man/man3/SSL_set_cert_cb.3
 man/man3/SSL_set_cipher_list.3
 man/man3/SSL_set_client_CA_list.3
 man/man3/SSL_set_connect_state.3
+man/man3/SSL_set_current_cert.3
+man/man3/SSL_set_ecdh_auto.3
 man/man3/SSL_set_ex_data.3
 man/man3/SSL_set_fd.3
 man/man3/SSL_set_generate_session_id.3
@@ -1180,15 +1429,26 @@ 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_add1_host.3
 man/man3/X509_VERIFY_PARAM_clear_flags.3
+man/man3/X509_VERIFY_PARAM_get0_peername.3
 man/man3/X509_VERIFY_PARAM_get_depth.3
 man/man3/X509_VERIFY_PARAM_get_flags.3
+man/man3/X509_VERIFY_PARAM_set1_email.3
+man/man3/X509_VERIFY_PARAM_set1_host.3
+man/man3/X509_VERIFY_PARAM_set1_ip.3
+man/man3/X509_VERIFY_PARAM_set1_ip_asc.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_hostflags.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_check_email.3
+man/man3/X509_check_host.3
+man/man3/X509_check_ip.3
+man/man3/X509_check_ip_asc.3
 man/man3/X509_free.3
 man/man3/X509_new.3
 man/man3/X509_verify_cert.3
@@ -1223,13 +1483,17 @@ man/man3/bn_sqr_recursive.3
 man/man3/bn_sqr_words.3
 man/man3/bn_sub_words.3
 man/man3/bn_wexpand.3
-man/man3/d2i_509_CRL_fp.3
 man/man3/d2i_ASN1_OBJECT.3
 man/man3/d2i_DHparams.3
 man/man3/d2i_DSAPrivateKey.3
 man/man3/d2i_DSAPublicKey.3
 man/man3/d2i_DSA_PUBKEY.3
 man/man3/d2i_DSA_SIG.3
+man/man3/d2i_DSAparams.3
+man/man3/d2i_ECDSA_SIG.3
+man/man3/d2i_ECPKParameters.3
+man/man3/d2i_ECPKParameters_bio.3
+man/man3/d2i_ECPKParameters_fp.3
 man/man3/d2i_Netscape_RSA.3
 man/man3/d2i_PKCS8PrivateKey.3
 man/man3/d2i_PKCS8PrivateKey_bio.3
@@ -1242,6 +1506,7 @@ man/man3/d2i_X509.3
 man/man3/d2i_X509_ALGOR.3
 man/man3/d2i_X509_CRL.3
 man/man3/d2i_X509_CRL_bio.3
+man/man3/d2i_X509_CRL_fp.3
 man/man3/d2i_X509_NAME.3
 man/man3/d2i_X509_REQ.3
 man/man3/d2i_X509_REQ_bio.3
@@ -1260,6 +1525,11 @@ 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_DSAparams.3
+man/man3/i2d_ECDSA_SIG.3
+man/man3/i2d_ECPKParameters.3
+man/man3/i2d_ECPKParameters_bio.3
+man/man3/i2d_ECPKParameters_fp(fp.3
 man/man3/i2d_Netscape_RSA.3
 man/man3/i2d_PKCS7_bio_stream.3
 man/man3/i2d_PKCS8PrivateKey_bio.3
@@ -1296,6 +1566,7 @@ man/man3/lh_node_usage_stats_bio.3
 man/man3/lh_retrieve.3
 man/man3/lh_stats.3
 man/man3/lh_stats_bio.3
+man/man3/openssl_.3
 man/man3/openssl_bio.3
 man/man3/openssl_blowfish.3
 man/man3/openssl_bn.3
@@ -1304,6 +1575,7 @@ man/man3/openssl_crypto.3
 man/man3/openssl_des.3
 man/man3/openssl_dh.3
 man/man3/openssl_dsa.3
+man/man3/openssl_ec.3
 man/man3/openssl_ecdsa.3
 man/man3/openssl_engine.3
 man/man3/openssl_err.3
@@ -1322,6 +1594,7 @@ man/man3/openssl_ssl.3
 man/man3/openssl_threads.3
 man/man3/openssl_ui.3
 man/man3/openssl_ui_compat.3
+man/man3/openssl_x).3
 man/man3/openssl_x509.3
 man/man5/openssl_config.5
 man/man5/openssl_x509v3_config.5
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 237b0409acb..2b815c12c85 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.110 2015/01/08 16:58:25 wiz Exp $
+$NetBSD: distinfo,v 1.111 2015/02/12 13:08:53 adam Exp $
 
-SHA1 (openssl-1.0.1k.tar.gz) = 19d818e202558c212a9583fcdaf876995a633ddf
-RMD160 (openssl-1.0.1k.tar.gz) = e22c085189c6ce640378f0cc67faa512b4b873f2
-Size (openssl-1.0.1k.tar.gz) = 4434910 bytes
-SHA1 (patch-Configure) = f8b8b3ecfa9d23530d13f8f93582db857f772fc4
-SHA1 (patch-Makefile.org) = be55df602286c7f0265a8c5c3d8edaea13b1d966
+SHA1 (openssl-1.0.2.tar.gz) = 2f264f7f6bb973af444cd9fc6ee65c8588f610cc
+RMD160 (openssl-1.0.2.tar.gz) = a5452cd1fd380dcbc1dd53d8e50da6ec632ebd6e
+Size (openssl-1.0.2.tar.gz) = 5265809 bytes
+SHA1 (patch-Configure) = b2b1b5e9f9cffde8814297fac88c84388c86694a
+SHA1 (patch-Makefile.org) = 72f023aeead660decaa09b6664936bd73a214069
 SHA1 (patch-Makefile.shared) = 709283ba4bb4bd568e289fe111b8dea319968328
 SHA1 (patch-apps_Makefile) = 745e01fb967979f5105896f8a728fd7a041af6c9
 SHA1 (patch-config) = ac8ced00cfa7d31b84afb08aedc38102fd777824
 SHA1 (patch-crypto_bn_bn__prime.pl) = c07e8ccba319e4260af46e714c3be56f70579fa6
-SHA1 (patch-crypto_des_Makefile) = 31d772eb8c80b577b9cd05337262ddfad297d9b1
+SHA1 (patch-crypto_des_Makefile) = 6c67c81ba7054647e1138165d9280c8db82b8498
 SHA1 (patch-engines_ccgost_Makefile) = 8834074c74abab604ef1ba7959750c22c0ffb6e7
 SHA1 (patch-tools_Makefile) = 6e7324d01c0cd5e290085fe8124315bcac8cf198
diff --git a/security/openssl/patches/patch-Configure b/security/openssl/patches/patch-Configure
index c3c839f4515..fc228fcf5e0 100644
--- a/security/openssl/patches/patch-Configure
+++ b/security/openssl/patches/patch-Configure
@@ -1,23 +1,12 @@
-$NetBSD: patch-Configure,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-Configure,v 1.3 2015/02/12 13:08:53 adam Exp $
 
 * Avoid -fast on Solaris, creates non-portable packages which depend on
   host-specific CPU features.
 * Add GNU/kFreeBSD support.
 
---- Configure.orig	Mon Mar 17 16:14:20 2014
+--- Configure.orig	2015-01-22 14:58:32.000000000 +0000
 +++ Configure
-@@ -225,8 +225,8 @@ my %table=(
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
-  
- #### Solaris x86 with Sun C setups
--"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
-+"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris64-x86_64-cc","cc:-xO5 -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
- 
- #### SPARC Solaris with GNU C setups
- "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -338,6 +338,7 @@ my %table=(
+@@ -341,6 +341,7 @@ my %table=(
  #
  "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
@@ -25,7 +14,7 @@ $NetBSD: patch-Configure,v 1.2 2014/05/13 02:23:11 rodent Exp $
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  
  ####
-@@ -422,7 +423,29 @@ my %table=(
+@@ -463,6 +464,28 @@ my %table=(
  "BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -50,28 +39,20 @@ $NetBSD: patch-Configure,v 1.2 2014/05/13 02:23:11 rodent Exp $
 +"DragonFly-x86_64",    "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"GNU/kFreeBSD-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"GNU/kFreeBSD-i386", "gcc:-DL_ENDIAN -DTERMIOS -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
 +
+ 
  "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
-@@ -865,13 +888,13 @@ PROCESS_ARGS:
+@@ -915,7 +938,7 @@ PROCESS_ARGS:
  			# The check for the option is there so scripts aren't
  			# broken
  			}
 -		elsif (/^[-+]/)
 +		elsif (/^[-+\/]/)
  			{
- 			if (/^-[lL](.*)$/ or /^-Wl,/)
- 				{
- 				$libs.=$_." ";
- 				}
--			elsif (/^-[^-]/ or /^\+/)
-+			elsif (/^-[^-]/ or /^\+/ or /^\//)
+ 			if (/^--prefix=(.*)$/)
  				{
- 				$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
- 				$flags.=$_." ";
-@@ -1674,7 +1697,7 @@ while (<IN>)
+@@ -1737,7 +1760,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
diff --git a/security/openssl/patches/patch-Makefile.org b/security/openssl/patches/patch-Makefile.org
index 3bd97c61a58..d3b39db6958 100644
--- a/security/openssl/patches/patch-Makefile.org
+++ b/security/openssl/patches/patch-Makefile.org
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.org,v 1.2 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-Makefile.org,v 1.3 2015/02/12 13:08:53 adam Exp $
 
 Adjust build procedure.
 
---- Makefile.org.orig	Mon Mar 17 16:14:20 2014
+--- Makefile.org.orig	2015-01-22 14:58:06.000000000 +0000
 +++ Makefile.org
 @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
  
@@ -12,7 +12,7 @@ Adjust build procedure.
  
  # NO_IDEA - Define to build without the IDEA algorithm
  # NO_RC4  - Define to build without the RC4 algorithm
-@@ -157,7 +158,7 @@ TESTS = alltests
+@@ -158,7 +159,7 @@ TESTS = alltests
  
  MAKEFILE= Makefile
  
@@ -21,7 +21,7 @@ Adjust build procedure.
  MAN1=1
  MAN3=3
  MANSUFFIX=
-@@ -174,6 +175,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+@@ -175,6 +176,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  SHARED_SSL=libssl$(SHLIB_EXT)
  SHARED_LIBS=
  SHARED_LIBS_LINK_EXTS=
@@ -29,7 +29,7 @@ Adjust build procedure.
  SHARED_LDFLAGS=
  
  GENERAL=        Makefile
-@@ -538,7 +540,7 @@ dist:   
+@@ -536,7 +538,7 @@ dist:   
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
@@ -38,13 +38,13 @@ Adjust build procedure.
  
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -643,41 +645,56 @@ install_docs:
+@@ -645,41 +647,56 @@ install_docs:
  	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
  	here="`pwd`"; \
  	filecase=; \
--	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
+-	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
 -		filecase=-i; \
--	fi; \
+-	esac; \
  	set -e; for i in doc/apps/*.pod; do \
  		fn=`basename $$i .pod`; \
  		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
diff --git a/security/openssl/patches/patch-crypto_des_Makefile b/security/openssl/patches/patch-crypto_des_Makefile
index c04889c9255..1c805f1a308 100644
--- a/security/openssl/patches/patch-crypto_des_Makefile
+++ b/security/openssl/patches/patch-crypto_des_Makefile
@@ -1,19 +1,18 @@
-$NetBSD: patch-crypto_des_Makefile,v 1.1 2014/05/13 02:23:11 rodent Exp $
+$NetBSD: patch-crypto_des_Makefile,v 1.2 2015/02/12 13:08:53 adam Exp $
 
 Not all m4 macro processors have severe buffer limitations.
 
---- crypto/des/Makefile.orig	Mon Apr  7 16:55:27 2014
+--- crypto/des/Makefile.orig	2015-01-22 16:12:10.000000000 +0000
 +++ crypto/des/Makefile
 @@ -60,7 +60,11 @@ des: des.o cbc3_enc.o lib
  	$(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
  
  des_enc-sparc.S:	asm/des_enc.m4
--	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
 +ifeq ($(OPSYS),SunOS)
-+		m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
+ 	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
 +else
-+		m4 asm/des_enc.m4 > des_enc-sparc.S
++	m4 asm/des_enc.m4 > des_enc-sparc.S
 +endif
+ dest4-sparcv9.s:	asm/dest4-sparcv9.pl
+ 	$(PERL) asm/dest4-sparcv9.pl $(CFLAGS) > $@
  
- des-586.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
- 	$(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@