MFH r381686: update to 1.0.1m.

Approved by:	ports-secteam@

12 files changed, 100 insertions, 108 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index ab73595f9ae6..7ed22a0c2159 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.1
-DISTVERSIONSUFFIX=	l
-PORTREVISION=	18
+DISTVERSIONSUFFIX=	m
+PORTREVISION=	19
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index ce15782d7dfe..9c6fc8dd0b2c 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,10 +1,10 @@
-SHA256 (openssl-1.0.1l/openssl-1.0.1l.tar.gz) = b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4
-SIZE (openssl-1.0.1l/openssl-1.0.1l.tar.gz) = 4429979
-SHA256 (openssl-1.0.1l/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
-SIZE (openssl-1.0.1l/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
-SHA256 (openssl-1.0.1l/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 30fbadf31dc13d9bcc758741f5560f6e13dd66c067f62d1b9066fb656f6aaaf2
-SIZE (openssl-1.0.1l/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5415
-SHA256 (openssl-1.0.1l/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b
-SIZE (openssl-1.0.1l/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625
-SHA256 (openssl-1.0.1l/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
-SIZE (openssl-1.0.1l/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
+SHA256 (openssl-1.0.1m/openssl-1.0.1m.tar.gz) = 095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
+SIZE (openssl-1.0.1m/openssl-1.0.1m.tar.gz) = 4533406
+SHA256 (openssl-1.0.1m/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
+SIZE (openssl-1.0.1m/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
+SHA256 (openssl-1.0.1m/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 30fbadf31dc13d9bcc758741f5560f6e13dd66c067f62d1b9066fb656f6aaaf2
+SIZE (openssl-1.0.1m/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5415
+SHA256 (openssl-1.0.1m/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b
+SIZE (openssl-1.0.1m/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625
+SHA256 (openssl-1.0.1m/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
+SIZE (openssl-1.0.1m/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure
index a970398e3fba..736b3c680598 100644
--- a/security/openssl/files/patch-Configure
+++ b/security/openssl/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig	2014-03-17 17:14:20.000000000 +0100
-+++ Configure	2014-04-12 17:20:19.000000000 +0200
-@@ -150,7 +150,7 @@
+--- Configure.orig	2015-03-19 13:37:10 UTC
++++ Configure
+@@ -150,7 +150,7 @@ my $no_asm=":::::::::::::::void";
  # which has to be accompanied by explicit -D_THREAD_SAFE and
  # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
  # seems to be sufficient?
@@ -9,37 +9,36 @@
  
  #config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
  
-@@ -409,19 +409,20 @@
+@@ -409,19 +409,19 @@ my %table=(
  "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  #### *BSD [do see comment about ${BSDthreads} above!]
--"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-sparcv8",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-generic32","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86-elf",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"debug-BSD-x86-elf",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-sparcv8",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+-"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-x86",	"gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-x86-elf",	"gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"debug-BSD-x86-elf",	"gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-sparcv8",	"gcc:-DB_ENDIAN -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"BSD-generic32","$ENV{'FREEBSDCC'}:-O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-x86",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-x86-elf",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIBVER)",
++"debug-BSD-x86-elf",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-sparcv8",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
  
--"BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-generic64","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+-"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"BSD-generic64","$ENV{'FREEBSDCC'}:-O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
  # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
  # simply *happens* to work around a compiler bug in gcc 3.3.3,
  # triggered by RIPEMD160 code.
--"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)",
-+"BSD-sparc64",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-ia64",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86_64",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-alpha",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
+-"BSD-sparc64",	"gcc:-DB_ENDIAN -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 -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 -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)",
++"BSD-sparc64",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-ia64",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
++"BSD-x86_64",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
  
  "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)",
  
-@@ -1922,10 +1923,12 @@
+@@ -1934,10 +1934,12 @@ EOF
  	if ( $perl =~ m@^/@) {
  	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
  	    &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
diff --git a/security/openssl/files/patch-RFC-5705 b/security/openssl/files/patch-RFC-5705
deleted file mode 100644
index 73c7e1b64692..000000000000
--- a/security/openssl/files/patch-RFC-5705
+++ /dev/null
@@ -1,34 +0,0 @@
---- ssl/ssl.h	6 Jan 2010 17:37:38 -0000	1.221.2.24
-+++ ssl/ssl.h	17 Jun 2010 12:25:35 -0000
-@@ -1806,6 +1806,10 @@
- /* Pre-shared secret session resumption functions */
- int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
- 
-+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
-+                           unsigned char *context, int context_len,
-+                           unsigned char *out, int olen);
-+
- /* BEGIN ERROR CODES */
- /* The following lines are auto generated by the script mkerr.pl. Any changes
-  * made after this point may be overwritten when the script is next run.
-
---- ssl/t1_enc.c	15 Jun 2010 17:25:15 -0000	1.57.2.3
-+++ ssl/t1_enc.c	17 Jun 2010 12:25:35 -0000
-@@ -1043,3 +1043,17 @@
- 		}
- 	}
- 
-+void SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
-+                           unsigned char *context, int context_len,
-+                           unsigned char *out, int olen)
-+	{
-+	unsigned char tmp[olen];
-+	
-+	tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
-+			 label, label_len,
-+			 s->s3->client_random,SSL3_RANDOM_SIZE,
-+			 s->s3->server_random,SSL3_RANDOM_SIZE,
-+			 context, context_len, NULL, 0,
-+			 s->session->master_key, s->session->master_key_length,
-+			 out, tmp, olen);
-+	}
diff --git a/security/openssl/files/patch-config b/security/openssl/files/patch-config
index c9d4fa7db0f5..abf3063b3a83 100644
--- a/security/openssl/files/patch-config
+++ b/security/openssl/files/patch-config
@@ -1,6 +1,6 @@
---- config.orig	2013-06-16 07:01:13.038797248 -0500
-+++ config	2013-06-16 07:01:18.138794838 -0500
-@@ -734,14 +734,8 @@
+--- config.orig	2015-03-19 13:37:10 UTC
++++ config
+@@ -734,14 +734,8 @@ case "$GUESSOS" in
    sparc64-*-*bsd*)	OUT="BSD-sparc64" ;;
    ia64-*-*bsd*)		OUT="BSD-ia64" ;;
    amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
diff --git a/security/openssl/files/patch-crypto_bio_bss__dgram.c b/security/openssl/files/patch-crypto_bio_bss__dgram.c
new file mode 100644
index 000000000000..e25290c92651
--- /dev/null
+++ b/security/openssl/files/patch-crypto_bio_bss__dgram.c
@@ -0,0 +1,20 @@
+--- crypto/bio/bss_dgram.c.orig	2015-03-19 13:37:10 UTC
++++ crypto/bio/bss_dgram.c
+@@ -1293,7 +1293,7 @@ static int dgram_sctp_read(BIO *b, char 
+                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
+             authchunks = OPENSSL_malloc(optlen);
+             if (!authchunks) {
+-                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
++                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
+                 return -1;
+             }
+             memset(authchunks, 0, sizeof(optlen));
+@@ -1365,7 +1365,7 @@ static int dgram_sctp_write(BIO *b, cons
+         char *tmp;
+         data->saved_message.bio = b;
+         if(!(tmp = OPENSSL_malloc(inl))) {
+-            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
++            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
+             return -1;
+         }
+         if (data->saved_message.data)
diff --git a/security/openssl/files/patch-crypto_evp_openbsd__hw.c b/security/openssl/files/patch-crypto_evp_openbsd__hw.c
new file mode 100644
index 000000000000..6705e0545fbb
--- /dev/null
+++ b/security/openssl/files/patch-crypto_evp_openbsd__hw.c
@@ -0,0 +1,14 @@
+--- crypto/evp/openbsd_hw.c.orig	2015-03-19 13:19:00 UTC
++++ crypto/evp/openbsd_hw.c
+@@ -108,7 +108,10 @@ static int dev_crypto_init(session_op *s
+             dev_failed = 1;
+             return 0;
+         }
+-        close(cryptodev_fd);
++        if (fd == -1)
++            fd = cryptodev_fd;
++        else
++            close(cryptodev_fd);
+     }
+     assert(ses);
+     memset(ses, '\0', sizeof *ses);
diff --git a/security/openssl/files/patch-crypto_md5_md5.c b/security/openssl/files/patch-crypto_md5_md5.c
new file mode 100644
index 000000000000..67720a125d25
--- /dev/null
+++ b/security/openssl/files/patch-crypto_md5_md5.c
@@ -0,0 +1,11 @@
+--- crypto/md5/md5.c.orig	2015-03-19 13:19:00 UTC
++++ crypto/md5/md5.c
+@@ -83,7 +83,7 @@ int main(int argc, char **argv)
+                 err++;
+                 continue;
+             }
+-            printf("MD5(%s)= ", argv[i]);
++            printf("MD5 (%s) = ", argv[i]);
+             do_fp(IN);
+             fclose(IN);
+         }
diff --git a/security/openssl/files/patch-md5.c b/security/openssl/files/patch-md5.c
deleted file mode 100644
index cd606a304160..000000000000
--- a/security/openssl/files/patch-md5.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- crypto/md5/md5.c.orig	Thu Apr  9 07:59:29 1998
-+++ crypto/md5/md5.c	Sun Dec 27 18:44:33 1998
-@@ -94,7 +94,7 @@
- 				err++;
- 				continue;
- 				}
--			printf("MD5(%s)= ",argv[i]);
-+			printf("MD5 (%s) = ",argv[i]);
- 			do_fp(IN);
- 			fclose(IN);
- 			}
diff --git a/security/openssl/files/patch-openbsd_hw.c b/security/openssl/files/patch-openbsd_hw.c
deleted file mode 100644
index d10c78013976..000000000000
--- a/security/openssl/files/patch-openbsd_hw.c
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: crypto/evp/openbsd_hw.c
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/evp/openbsd_hw.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 openbsd_hw.c
---- crypto/evp/openbsd_hw.c	28 Jan 2003 21:24:39 -0000	1.1.1.1
-+++ crypto/evp/openbsd_hw.c	18 Jan 2005 12:26:45 -0000
-@@ -109,7 +109,10 @@
- 	    dev_failed=1;
- 	    return 0;
- 	    }
--	close(cryptodev_fd);
-+	if (fd == -1)
-+		fd = cryptodev_fd;
-+	else
-+		close(cryptodev_fd);
- 	}
-     assert(ses);
-     memset(ses,'\0',sizeof *ses);
diff --git a/security/openssl/files/patch-ssl-srtp.h b/security/openssl/files/patch-ssl-srtp.h
index 7ab47abb22db..5640d65100fb 100644
--- a/security/openssl/files/patch-ssl-srtp.h
+++ b/security/openssl/files/patch-ssl-srtp.h
@@ -1,10 +1,10 @@
---- ssl/srtp.h.orig	2012-04-26 22:40:38.000000000 -0500
-+++ ssl/srtp.h	2012-04-26 22:40:51.000000000 -0500
-@@ -135,7 +135,6 @@
+--- ssl/srtp.h.orig	2015-03-19 13:37:10 UTC
++++ ssl/srtp.h
+@@ -137,7 +137,6 @@ int SSL_set_tlsext_use_srtp(SSL *ctx, co
  SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
  
  STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
 -SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
  
- #ifdef  __cplusplus
- }
+ # endif
+ 
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 9c38d5f04217..2fc332938f23 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -426,6 +426,7 @@ man/man3/CMS_encrypt.3.gz
 man/man3/CMS_final.3.gz
 man/man3/CMS_get0_RecipientInfos.3.gz
 man/man3/CMS_get0_SignerInfos.3.gz
+man/man3/CMS_get0_content.3.gz
 man/man3/CMS_get0_eContentType.3.gz
 man/man3/CMS_get0_type.3.gz
 man/man3/CMS_get1_ReceiptRequest.3.gz
@@ -918,6 +919,7 @@ man/man3/SSL_CTX_free.3.gz
 man/man3/SSL_CTX_get_cert_store.3.gz
 man/man3/SSL_CTX_get_client_CA_list.3.gz
 man/man3/SSL_CTX_get_client_cert_cb.3.gz
+man/man3/SSL_CTX_get_default_read_ahead.3.gz
 man/man3/SSL_CTX_get_ex_data.3.gz
 man/man3/SSL_CTX_get_ex_new_index.3.gz
 man/man3/SSL_CTX_get_info_callback.3.gz
@@ -925,6 +927,7 @@ man/man3/SSL_CTX_get_max_cert_list.3.gz
 man/man3/SSL_CTX_get_mode.3.gz
 man/man3/SSL_CTX_get_options.3.gz
 man/man3/SSL_CTX_get_quiet_shutdown.3.gz
+man/man3/SSL_CTX_get_read_ahead.3.gz
 man/man3/SSL_CTX_get_session_cache_mode.3.gz
 man/man3/SSL_CTX_get_timeout.3.gz
 man/man3/SSL_CTX_get_verify_callback.3.gz
@@ -962,6 +965,7 @@ man/man3/SSL_CTX_set_client_CA_list.3.gz
 man/man3/SSL_CTX_set_client_cert_cb.3.gz
 man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 man/man3/SSL_CTX_set_default_passwd_cb_userdata.3.gz
+man/man3/SSL_CTX_set_default_read_ahead.3.gz
 man/man3/SSL_CTX_set_ex_data.3.gz
 man/man3/SSL_CTX_set_generate_session_id.3.gz
 man/man3/SSL_CTX_set_info_callback.3.gz
@@ -973,6 +977,7 @@ man/man3/SSL_CTX_set_options.3.gz
 man/man3/SSL_CTX_set_psk_client_callback.3.gz
 man/man3/SSL_CTX_set_psk_server_callback.3.gz
 man/man3/SSL_CTX_set_quiet_shutdown.3.gz
+man/man3/SSL_CTX_set_read_ahead.3.gz
 man/man3/SSL_CTX_set_session_cache_mode.3.gz
 man/man3/SSL_CTX_set_session_id_context.3.gz
 man/man3/SSL_CTX_set_ssl_version.3.gz
@@ -1046,6 +1051,7 @@ man/man3/SSL_get_psk_identity.3.gz
 man/man3/SSL_get_psk_identity_hint.3.gz
 man/man3/SSL_get_quiet_shutdown.3.gz
 man/man3/SSL_get_rbio.3.gz
+man/man3/SSL_get_read_ahead.3.gz
 man/man3/SSL_get_secure_renegotiation_support.3.gz
 man/man3/SSL_get_session.3.gz
 man/man3/SSL_get_shutdown.3.gz
@@ -1082,6 +1088,7 @@ man/man3/SSL_set_options.3.gz
 man/man3/SSL_set_psk_client_callback.3.gz
 man/man3/SSL_set_psk_server_callback.3.gz
 man/man3/SSL_set_quiet_shutdown.3.gz
+man/man3/SSL_set_read_ahead.3.gz
 man/man3/SSL_set_session.3.gz
 man/man3/SSL_set_session_id_context.3.gz
 man/man3/SSL_set_shutdown.3.gz
@@ -1234,11 +1241,14 @@ man/man3/buffer.3.gz
 man/man3/crypto.3.gz
 man/man3/d2i_509_CRL_fp.3.gz
 man/man3/d2i_ASN1_OBJECT.3.gz
+man/man3/d2i_CMS_ContentInfo.3.gz
 man/man3/d2i_DHparams.3.gz
 man/man3/d2i_DSAPrivateKey.3.gz
 man/man3/d2i_DSAPublicKey.3.gz
 man/man3/d2i_DSA_PUBKEY.3.gz
 man/man3/d2i_DSA_SIG.3.gz
+man/man3/d2i_ECPrivateKey.3.gz
+man/man3/d2i_ECPrivate_key.3.gz
 man/man3/d2i_Netscape_RSA.3.gz
 man/man3/d2i_PKCS8PrivateKey.3.gz
 man/man3/d2i_PKCS8PrivateKey_bio.3.gz
@@ -1271,12 +1281,14 @@ man/man3/err.3.gz
 man/man3/evp.3.gz
 man/man3/hmac.3.gz
 man/man3/i2d_ASN1_OBJECT.3.gz
+man/man3/i2d_CMS_ContentInfo.3.gz
 man/man3/i2d_CMS_bio_stream.3.gz
 man/man3/i2d_DHparams.3.gz
 man/man3/i2d_DSAPrivateKey.3.gz
 man/man3/i2d_DSAPublicKey.3.gz
 man/man3/i2d_DSA_PUBKEY.3.gz
 man/man3/i2d_DSA_SIG.3.gz
+man/man3/i2d_ECPrivateKey.3.gz
 man/man3/i2d_Netscape_RSA.3.gz
 man/man3/i2d_PKCS7_bio_stream.3.gz
 man/man3/i2d_PKCS8PrivateKey_bio.3.gz