3 files changed, 87 insertions, 4 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index b1f62f5eaf8a..abb349fd47cc 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-PORTVERSION=	1.0.2l
+PORTVERSION=	1.0.2m
 PORTEPOCH=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 8400446452b6..432f07b68d07 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1495727915
-SHA256 (openssl-1.0.2/openssl-1.0.2l.tar.gz) = ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c
-SIZE (openssl-1.0.2/openssl-1.0.2l.tar.gz) = 5365054
+TIMESTAMP = 1509655985
+SHA256 (openssl-1.0.2/openssl-1.0.2m.tar.gz) = 8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f
+SIZE (openssl-1.0.2/openssl-1.0.2m.tar.gz) = 5373776
 SHA256 (openssl-1.0.2/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7
 SIZE (openssl-1.0.2/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717
 SHA256 (openssl-1.0.2/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index d72e3875bd4a..3d12bdf193da 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -125,6 +125,48 @@ man/man1/mdc2.1.gz
 man/man1/nseq.1.gz
 man/man1/ocsp.1.gz
 man/man1/openssl.1.gz
+man/man1/openssl-asn1parse.1.gz
+man/man1/openssl-ca.1.gz
+man/man1/openssl-ciphers.1.gz
+man/man1/openssl-cms.1.gz
+man/man1/openssl-crl.1.gz
+man/man1/openssl-crl2pkcs7.1.gz
+man/man1/openssl-dgst.1.gz
+man/man1/openssl-dhparam.1.gz
+man/man1/openssl-dsa.1.gz
+man/man1/openssl-dsaparam.1.gz
+man/man1/openssl-ec.1.gz
+man/man1/openssl-ecparam.1.gz
+man/man1/openssl-enc.1.gz
+man/man1/openssl-errstr.1.gz
+man/man1/openssl-gendsa.1.gz
+man/man1/openssl-genpkey.1.gz
+man/man1/openssl-genrsa.1.gz
+man/man1/openssl-nseq.1.gz
+man/man1/openssl-ocsp.1.gz
+man/man1/openssl-passwd.1.gz
+man/man1/openssl-pkcs12.1.gz
+man/man1/openssl-pkcs7.1.gz
+man/man1/openssl-pkcs8.1.gz
+man/man1/openssl-pkey.1.gz
+man/man1/openssl-pkeyparam.1.gz
+man/man1/openssl-pkeyutl.1.gz
+man/man1/openssl-rand.1.gz
+man/man1/openssl-req.1.gz
+man/man1/openssl-rsa.1.gz
+man/man1/openssl-rsautl.1.gz
+man/man1/openssl-s_client.1.gz
+man/man1/openssl-s_server.1.gz
+man/man1/openssl-s_time.1.gz
+man/man1/openssl-sess_id.1.gz
+man/man1/openssl-smime.1.gz
+man/man1/openssl-speed.1.gz
+man/man1/openssl-spkac.1.gz
+man/man1/openssl-ts.1.gz
+man/man1/openssl-tsget.1.gz
+man/man1/openssl-verify.1.gz
+man/man1/openssl-version.1.gz
+man/man1/openssl-x509.1.gz
 man/man1/passwd.1.gz
 man/man1/pkcs12.1.gz
 man/man1/pkcs7.1.gz
@@ -817,6 +859,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_pss_saltlen.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_signature_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_METHOD.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DH.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DSA.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_EC_KEY.3.gz
@@ -840,6 +883,39 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_PKEY_get_default_digest_nid.3.gz
 %%MAN3%%man/man3/EVP_PKEY_keygen.3.gz
 %%MAN3%%man/man3/EVP_PKEY_keygen_init.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_add0.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_copy.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_find.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_free.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_cleanup.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_copy.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_ctrl.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_decrypt.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_derive.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_encrypt.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_init.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_keygen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_paramgen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_sign.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_signctx.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_verify.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_verify_recover.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get_verifyctx.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_new.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_cleanup.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_copy.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_ctrl.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_decrypt.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_derive.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_encrypt.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_init.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_keygen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_paramgen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_sign.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_signctx.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_verify.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_verify_recover.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_set_verifyctx.3.gz
 %%MAN3%%man/man3/EVP_PKEY_missing_parameters.3.gz
 %%MAN3%%man/man3/EVP_PKEY_new.3.gz
 %%MAN3%%man/man3/EVP_PKEY_paramgen.3.gz
@@ -1266,6 +1342,8 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_session_id_context.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_ssl_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_timeout.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tlsext_servername_arg.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tlsext_servername_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_status_arg.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_status_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3.gz
@@ -1315,6 +1393,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/SSL_connect.3.gz
 %%MAN3%%man/man3/SSL_ctrl.3.gz
 %%MAN3%%man/man3/SSL_do_handshake.3.gz
+%%MAN3%%man/man3/SSL_export_keying_material.3.gz
 %%MAN3%%man/man3/SSL_flush_sessions.3.gz
 %%MAN3%%man/man3/SSL_free.3.gz
 %%MAN3%%man/man3/SSL_get0_alpn_selected.3.gz
@@ -1350,6 +1429,8 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/SSL_get_rbio.3.gz
 %%MAN3%%man/man3/SSL_get_read_ahead.3.gz
 %%MAN3%%man/man3/SSL_get_secure_renegotiation_support.3.gz
+%%MAN3%%man/man3/SSL_get_servername.3.gz
+%%MAN3%%man/man3/SSL_get_servername_type.3.gz
 %%MAN3%%man/man3/SSL_get_session.3.gz
 %%MAN3%%man/man3/SSL_get_shared_curve.3.gz
 %%MAN3%%man/man3/SSL_get_shutdown.3.gz
@@ -1502,6 +1583,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_NAME_print.3.gz
 %%MAN3%%man/man3/X509_NAME_print_ex.3.gz
 %%MAN3%%man/man3/X509_NAME_print_ex_fp.3.gz
+%%MAN3%%man/man3/X509_REQ_check_private_key.3.gz
 %%MAN3%%man/man3/X509_STORE_CTX_cleanup.3.gz
 %%MAN3%%man/man3/X509_STORE_CTX_free.3.gz
 %%MAN3%%man/man3/X509_STORE_CTX_get0_param.3.gz
@@ -1545,6 +1627,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_check_host.3.gz
 %%MAN3%%man/man3/X509_check_ip.3.gz
 %%MAN3%%man/man3/X509_check_ip_asc.3.gz
+%%MAN3%%man/man3/X509_check_private_key.3.gz
 %%MAN3%%man/man3/X509_free.3.gz
 %%MAN3%%man/man3/X509_new.3.gz
 %%MAN3%%man/man3/X509_verify_cert.3.gz