Update to OpenSSL 0.9.6. Update contributed by Dave Burgess,

in PR pkg/12569.

Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:

    o Some documentation for BIO and SSL libraries.
    o Enhanced chain verification using key identifiers.
    o New sign and verify options to 'dgst' application.
    o Support for DER and PEM encoded messages in 'smime' application.
    o New 'rsautl' application, low level RSA utility. [*]
    o MD4 now included.
    o Bugfix for SSL rollback padding check.
    o Support for external crypto devices [1].
    o Enhanced EVP interface.

[1] The support for external crypto devices is currently a separate
      distribution.  See the file README.ENGINE.
[*] Not installed with the package.

9 files changed, 385 insertions, 230 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 4e0780a687b..a82ca7c1bf5 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2001/04/09 02:36:47 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2001/04/09 04:29:23 fredb Exp $
 #
 
-DISTNAME=		openssl-0.9.5a
+DISTNAME=		openssl-0.9.6
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssl.org/source/ \
 			ftp://ftp.uni-trier.de/pub/unix/security/openssl/
diff --git a/security/openssl/files/md5 b/security/openssl/files/md5
index 79a8bb4e08d..b82492e31de 100644
--- a/security/openssl/files/md5
+++ b/security/openssl/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/04/21 02:15:40 explorer Exp $
+$NetBSD: md5,v 1.6 2001/04/09 04:29:23 fredb Exp $
 
-MD5 (openssl-0.9.5a.tar.gz) = 8fcb6a8ba511ec8b54b95f267ef52cf0
+SHA1 (openssl-0.9.6.tar.gz) = d69c964d58535343787a3b8ac38a48772704304c
diff --git a/security/openssl/files/patch-sum b/security/openssl/files/patch-sum
index dd33d19c3fa..4694fc25082 100644
--- a/security/openssl/files/patch-sum
+++ b/security/openssl/files/patch-sum
@@ -1,12 +1,13 @@
-$NetBSD: patch-sum,v 1.11 2001/03/16 13:42:08 wiz Exp $
+$NetBSD: patch-sum,v 1.12 2001/04/09 04:29:23 fredb Exp $
 
-SHA1 (patch-aa) = 0a2f8d3349ceeab2e6148e30c54200c8a5c99da2
-SHA1 (patch-ab) = cd114e5424a233ce80defcc2fb5144d50fcd9dde
+SHA1 (patch-aa) = 19566be10971160b5ff6b17a256313d95e7ab184
+SHA1 (patch-ab) = 1c74693ced6166d9c281678a4b45830de9bf9d33
 SHA1 (patch-ac) = 22520298de1a32ebc3c148f0785a5e9d7782c998
-SHA1 (patch-ad) = 20e47c6b6387e40131dd4401d75db46a78bd0d5f
+SHA1 (patch-ad) = 86fabb4b2e1dbeab20e1fb2f4d6cc6018cfd7ab7
 SHA1 (patch-ae) = f445d79ecc6b210ba42db8baf18d02041c8016f8
 SHA1 (patch-af) = 5d063c0354fa242e9e21530fc9d5d07f5774171a
 SHA1 (patch-ag) = e1b67db5a18e600c09386e319af0dccfd239f3ca
 SHA1 (patch-ah) = a668804efc7402dd014804397af13f95a2f8b6da
 SHA1 (patch-ai) = d0f21b594a3343567f7cbea00e71c5319a877782
-SHA1 (patch-aj) = 56fc932b7b7f2fea5b8337065103b41813257849
+SHA1 (patch-aj) = 3a6b1ebc20c72adf2157cf9dbc3560003bd10666
+SHA1 (patch-ak) = 5365aa7901418d6e171f713e7fd4531ca4926d2b
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 7f4f72fd4a3..b6d91eb1797 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,48 +1,70 @@
-$NetBSD: patch-aa,v 1.5 2001/01/17 10:09:51 wiz Exp $
-
---- config.orig	Mon Aug  9 05:16:51 1999
-+++ config
-@@ -155,8 +155,12 @@
-         echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
-         ;;
- 
--    NetBSD:*:*:*386*)
--        echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-netbsd"; exit 0
-+    NetBSD:*:*:i386)
-+	if echo __ELF__ | cc -E - | grep -q __ELF__; then
-+	    echo "i386-whatever-netbsd"; exit 0
-+	else
-+	    echo "i386elf-whatever-netbsd"; exit 0
-+	fi
- 	;;
- 
-     NetBSD:*)
-@@ -324,6 +324,7 @@
-   CC=cc
- fi
- 
-+if false; then
- if [ "$SYSTEM" = "SunOS" ]; then
-   # check for WorkShop C, expected output is "cc: blah-blah C x.x"
-   CCVER=`(cc -V 2>&1) 2>/dev/null | \
-@@ -340,6 +341,7 @@
-   elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
-     CC=sc3
-   fi
-+fi
- fi
- 
- if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
-@@ -404,9 +408,9 @@
-   alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
-   *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
-   *-freebsd[1-2]*) OUT="FreeBSD" ;;
--  *86*-*-netbsd) OUT="NetBSD-x86" ;;
--  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
--  *-*-netbsd) OUT="NetBSD-sparc" ;;
-+  *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;;
-+  *86-*-netbsd) OUT="NetBSD-i386" ;;
-+  *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;;
-   *86*-*-openbsd) OUT="OpenBSD-x86" ;;
-   alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
-   pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
+*** config.orig	Thu Sep 21 04:23:14 2000
+--- config	Sat Apr  7 12:38:53 2001
+***************
+*** 167,176 ****
+          echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
+          ;;
+  
+!     NetBSD:*:*:*386*)
+!         echo "`/usr/sbin/sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
+  	;;
+! 
+      NetBSD:*)
+  	echo "${MACHINE}-whatever-netbsd"; exit 0
+  	;;
+--- 167,180 ----
+          echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0
+          ;;
+  
+!     NetBSD:*:*:i386)
+! 	if echo __ELF__ | cc -E - | grep -q __ELF__; then
+! 	    echo "i386-whatever-netbsd"; exit 0
+! 	else
+! 	    echo "i386elf-whatever-netbsd"; exit 0
+! 	fi
+  	;;
+!   
+      NetBSD:*)
+  	echo "${MACHINE}-whatever-netbsd"; exit 0
+  	;;
+***************
+*** 330,335 ****
+--- 334,340 ----
+    CC=cc
+  fi
+  
++ if false; then
+  if [ "$SYSTEM" = "SunOS" ]; then
+    # check for WorkShop C, expected output is "cc: blah-blah C x.x"
+    CCVER=`(cc -V 2>&1) 2>/dev/null | \
+***************
+*** 347,352 ****
+--- 352,358 ----
+      CC=sc3
+    fi
+  fi
++ fi
+  
+  if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
+    # check for Compaq C, expected output is "blah-blah C Vx.x"
+***************
+*** 454,462 ****
+    alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
+    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
+    *-freebsd[1-2]*) OUT="FreeBSD" ;;
+!   *86*-*-netbsd) OUT="NetBSD-x86" ;;
+!   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
+!   *-*-netbsd) OUT="NetBSD-sparc" ;;
+    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
+    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
+    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
+--- 460,468 ----
+    alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
+    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
+    *-freebsd[1-2]*) OUT="FreeBSD" ;;
+!   *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;;
+!   *86-*-netbsd) OUT="NetBSD-i386" ;;
+!   *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;;
+    *86*-*-openbsd) OUT="OpenBSD-x86" ;;
+    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
+    pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
diff --git a/security/openssl/patches/patch-aj b/security/openssl/patches/patch-aj
index 33a7f9c6714..bc70fc46a55 100644
--- a/security/openssl/patches/patch-aj
+++ b/security/openssl/patches/patch-aj
@@ -1,13 +1,26 @@
-$NetBSD: patch-aj,v 1.3 2000/04/22 05:07:04 fredb Exp $
-
---- e_os.h.orig	Thu Mar 23 14:31:49 2000
-+++ e_os.h	Fri Apr 21 23:51:15 2000
-@@ -289,7 +289,7 @@
- #      define ssize_t int /* ditto */
- #    endif
- 
--#    define OPENSSL_CONF	"openssl.cnf"
-+#    define OPENSSL_CONF	"etc/openssl.cnf"
- #    define SSLEAY_CONF		OPENSSL_CONF
- #    define RFILE		".rnd"
- #    define LIST_SEPARATOR_CHAR ':'
+*** e_os.h.orig	Thu Sep 21 04:23:14 2000
+--- e_os.h	Sat Apr  7 13:19:47 2001
+***************
+*** 1,4 ****
+- /* e_os.h */
+  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+   * All rights reserved.
+   *
+--- 1,3 ----
+***************
+*** 297,303 ****
+         typedef unsigned long clock_t;
+  #    endif
+  
+! #    define OPENSSL_CONF	"openssl.cnf"
+  #    define SSLEAY_CONF		OPENSSL_CONF
+  #    define RFILE		".rnd"
+  #    define LIST_SEPARATOR_CHAR ':'
+--- 296,302 ----
+         typedef unsigned long clock_t;
+  #    endif
+  
+! #    define OPENSSL_CONF	"etc/openssl.cnf"
+  #    define SSLEAY_CONF		OPENSSL_CONF
+  #    define RFILE		".rnd"
+  #    define LIST_SEPARATOR_CHAR ':'
diff --git a/security/openssl/patches/patch_netbsd-ab b/security/openssl/patches/patch_netbsd-ab
index 2dec0c56aa8..a5d9ad9f4fd 100644
--- a/security/openssl/patches/patch_netbsd-ab
+++ b/security/openssl/patches/patch_netbsd-ab
@@ -1,107 +1,138 @@
-$NetBSD: patch_netbsd-ab,v 1.1 2001/04/05 14:00:59 wiz Exp $
-
---- Configure.orig	Mon Mar 27 23:28:10 2000
-+++ Configure
-@@ -274,9 +274,6 @@
- "linux-mips",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
- "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
- "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::",
--"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
--"NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
--"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
- "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
- "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
- "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
-@@ -297,6 +294,20 @@
- "aix-cc",   "cc:-O -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
- "aix-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
- 
-+# NetBSD
-+"NetBSD-alpha", "gcc:-DTERMIOS -O3 -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:",
-+"NetBSD-arm32", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-i386", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm:",
-+"NetBSD-i386elf", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm:",
-+"NetBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-mipseb", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-mipsel", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-ns32k", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-powerpc", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+"NetBSD-sparc64", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1:",
-+"NetBSD-vax", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
-+
- #
- # Cray T90 (SDSC)
- # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
-@@ -421,6 +432,7 @@
- my $openssl_other_defines="";
- my $libs="";
- my $target="";
-+my $xmakelib="";
- my $options="";
- foreach (@ARGV)
- 	{
-@@ -458,11 +470,12 @@
- 		{
- 		$libs.= "-lRSAglue -lrsaref ";
- 		$flags.= "-DRSAref ";
-+		$xmakelib=" libRSAglue.a";
- 		$openssl_other_defines .= "#define RSAref\n";
- 		}
- 	elsif (/^[-+]/)
- 		{
--		if (/^-[lL](.*)$/)
-+		if (/^-([lLR]|Wl,)(.*)$/)
- 			{
- 			$libs.=$_." ";
- 			}
-@@ -626,14 +639,19 @@
- 
- if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
- 	{
--	$major=$1;
--	$minor=$2;
-+# XXX Openssl version is 0.9, not 1.0
-+	$major=1;
-+	$minor=0;
- 	}
- 
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
- print OUT "### Generated automatically from Makefile.org by Configure.\n\n";
- my $sdirs=0;
-+my $is_elf="0";
-+if ($target =~ /.*elf.*/) {
-+	$is_elf="1";
-+}
- while (<IN>)
- 	{
- 	chop;
-@@ -645,6 +663,7 @@
- 			}
- 		}
- 	$sdirs = 0 unless /\\$/;
-+	s/^IS_ELF=.*/IS_ELF=$is_elf/;
- 	s/^VERSION=.*/VERSION=$version/;
- 	s/^MAJOR=.*/MAJOR=$major/;
- 	s/^MINOR=.*/MINOR=$minor/;
-@@ -669,6 +688,19 @@
- 	s/^PROCESSOR=.*/PROCESSOR= $processor/;
- 	s/^RANLIB=.*/RANLIB= $ranlib/;
- 	s/^PERL=.*/PERL= $perl/;
-+	print OUT $_."\n";
-+	}
-+close(IN);
-+close(OUT);
-+
-+rename("crypto/Makefile.ssl", "crypto/Makefile.org") unless -e "crypto/Makefile.org";
-+open(IN, '<crypto/Makefile.org') || die "unable to read crypto/Makefile.org:$!\n";
-+open(OUT,">crypto/Makefile.ssl") || die "unable to create crypto/Makefile.ssl:$!\n";
-+
-+while (<IN>)
-+	{
-+	chop;
-+	s/^(.*)\${MAKELIB}(.*)$/$&$xmakelib/;
- 	print OUT $_."\n";
- 	}
- close(IN);
+*** Configure.orig	Sun Sep 24 10:27:37 2000
+--- Configure	Sat Apr  7 12:56:24 2001
+***************
+*** 298,306 ****
+  "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+  "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
+  "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG::",
+- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+- "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:",
+  "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+  "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+  "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+--- 298,303 ----
+***************
+*** 327,332 ****
+--- 324,343 ----
+  "aix-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown)::BN_LLONG RC4_CHAR:::",
+  "aix-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::",
+  
++ # NetBSD
++ "NetBSD-alpha", "gcc:-DTERMIOS -O3 -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:",
++ "NetBSD-arm32", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-i386", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm:",
++ "NetBSD-i386elf", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm:",
++ "NetBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-mipseb", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-mipsel", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-ns32k", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-powerpc", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ "NetBSD-sparc64", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1:",
++ "NetBSD-vax", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:",
++ 
+  #
+  # Cray T90 (SDSC)
+  # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
+***************
+*** 458,463 ****
+--- 469,475 ----
+  my $openssl_other_defines;
+  my $libs;
+  my $target;
++ my $xmakelib="";
+  my $options;
+  my $symlink;
+  
+***************
+*** 548,558 ****
+  			{
+  			$libs.= "-lRSAglue -lrsaref ";
+  			$flags.= "-DRSAref ";
+  			$openssl_other_defines .= "#define RSAref\n";
+  			}
+  		elsif (/^[-+]/)
+  			{
+! 			if (/^-[lL](.*)$/)
+  				{
+  				$libs.=$_." ";
+  				}
+--- 560,571 ----
+  			{
+  			$libs.= "-lRSAglue -lrsaref ";
+  			$flags.= "-DRSAref ";
++ 			$xmakelib=" libRSAglue.a";
+  			$openssl_other_defines .= "#define RSAref\n";
+  			}
+  		elsif (/^[-+]/)
+  			{
+!  			if (/^-([lLR]|Wl,)(.*)$/)
+  				{
+  				$libs.=$_." ";
+  				}
+***************
+*** 768,775 ****
+  
+  if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
+  	{
+! 	$major=$1;
+! 	$minor=$2;
+  	}
+  
+  if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
+--- 781,789 ----
+  
+  if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
+  	{
+! 	# XXX Openssl version is 0.9, not 1.0
+! 	$major=1;
+! 	$minor=0;
+  	}
+  
+  if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
+***************
+*** 782,787 ****
+--- 796,805 ----
+  open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
+  print OUT "### Generated automatically from Makefile.org by Configure.\n\n";
+  my $sdirs=0;
++ my $is_elf="0";
++ if ($target =~ /.*elf.*/) {
++ 	$is_elf="1";
++ }
+  while (<IN>)
+  	{
+  	chop;
+***************
+*** 793,798 ****
+--- 811,817 ----
+  			}
+  		}
+  	$sdirs = 0 unless /\\$/;
++ 	s/^IS_ELF=.*/IS_ELF=$is_elf/;
+  	s/^VERSION=.*/VERSION=$version/;
+  	s/^MAJOR=.*/MAJOR=$major/;
+  	s/^MINOR=.*/MINOR=$minor/;
+***************
+*** 826,831 ****
+--- 845,863 ----
+  	s/^SHLIB_MARK1=.*/SHLIB_MARK1=$shared_mark1/;
+  	s/^SHLIB_MARK2=.*/SHLIB_MARK2=$shared_mark2/;
+  	s/^LIBS=.*/LIBS=libcrypto\.so\* libssl\.so\*/ if (!$no_shared);
++ 	print OUT $_."\n";
++ 	}
++ close(IN);
++ close(OUT);
++ 
++ rename("crypto/Makefile.ssl", "crypto/Makefile.org") unless -e "crypto/Makefile.org";
++ open(IN, '<crypto/Makefile.org') || die "unable to read crypto/Makefile.org:$!\n";
++ open(OUT,">crypto/Makefile.ssl") || die "unable to create crypto/Makefile.ssl:$!\n";
++ 
++ while (<IN>)
++ 	{
++ 	chop;
++ 	s/^(.*)\${MAKELIB}(.*)$/$&$xmakelib/;
+  	print OUT $_."\n";
+  	}
+  close(IN);
diff --git a/security/openssl/patches/patch_netbsd-ad b/security/openssl/patches/patch_netbsd-ad
index bfd1d93a738..a10069db560 100644
--- a/security/openssl/patches/patch_netbsd-ad
+++ b/security/openssl/patches/patch_netbsd-ad
@@ -1,30 +1,46 @@
-$NetBSD: patch_netbsd-ad,v 1.1 2001/04/05 14:01:00 wiz Exp $
-
---- Makefile.org.orig	Thu Mar 16 13:46:20 2000
-+++ Makefile.org	Fri Apr 21 23:43:06 2000
-@@ -48,6 +48,7 @@
- CC= gcc
- #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
- CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-+IS_ELF=0
- DEPFLAG= 
- PEX_LIBS= -L. -L.. -L../.. -L../../..
- EX_LIBS= 
-@@ -142,7 +143,7 @@
- #RMD160_ASM_OBJ= asm/rm86-out.o       # a.out, FreeBSD
- #RMD160_ASM_OBJ= asm/rm86bsdi.o       # bsdi
- 
--DIRS=   crypto ssl rsaref apps test tools
-+DIRS=   rsaref crypto ssl apps test tools
- SHLIBDIRS= crypto ssl
- 
- # dirs in crypto to build
-@@ -179,7 +180,7 @@
- 	@for i in $(DIRS) ;\
- 	do \
- 	(cd $$i && echo "making all in $$i..." && \
--	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-+	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' MAJOR='${MAJOR}' MINOR='${MINOR}' IS_ELF='${IS_ELF}' all ) || exit 1; \
- 	done
- 	-@# cd crypto; $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps
- 	-@# cd perl; $(PERL) Makefile.PL; make
+*** Makefile.org.orig	Thu Sep 21 04:23:13 2000
+--- Makefile.org	Sat Apr  7 13:13:26 2001
+***************
+*** 55,60 ****
+--- 55,61 ----
+  CC= gcc
+  #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
+  CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
++ IS_ELF=0
+  DEPFLAG= 
+  PEX_LIBS= -L. -L.. -L../.. -L../../..
+  EX_LIBS= 
+***************
+*** 156,162 ****
+  SHLIB_MARK1=.shlib-clean.
+  SHLIB_MARK2=.shlib.
+  
+! DIRS=   crypto ssl rsaref $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2)
+  SHLIBDIRS= crypto ssl
+  
+  # dirs in crypto to build
+--- 157,163 ----
+  SHLIB_MARK1=.shlib-clean.
+  SHLIB_MARK2=.shlib.
+  
+! DIRS=   rsaref crypto ssl $(SHLIB_MARK1) apps test tools $(SHLIB_MARK2)
+  SHLIBDIRS= crypto ssl
+  
+  # dirs in crypto to build
+***************
+*** 205,211 ****
+  		need_shlib=false; \
+  	else \
+  		(cd $$i && echo "making all in $$i..." && \
+! 		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
+  	fi; \
+  	done; \
+  	if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \
+--- 206,212 ----
+  		need_shlib=false; \
+  	else \
+  		(cd $$i && echo "making all in $$i..." && \
+!  		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' MAJOR='${MAJOR}' MINOR='${MINOR}' IS_ELF='${IS_ELF}' all ) || exit 1; \
+  	fi; \
+  	done; \
+  	if $$need_shlib && [ "$(SHLIB_MARK1)" != "" -o "$(SHLIB_MARK1)" != "" ]; then \
diff --git a/security/openssl/patches/patch_netbsd-ak b/security/openssl/patches/patch_netbsd-ak
new file mode 100644
index 00000000000..db51e853795
--- /dev/null
+++ b/security/openssl/patches/patch_netbsd-ak
@@ -0,0 +1,19 @@
+*** apps/speed.c.orig	Sat Apr  7 13:33:11 2001
+--- apps/speed.c	Sat Apr  7 13:32:37 2001
+***************
+*** 82,88 ****
+  #include <openssl/rand.h>
+  #include <openssl/err.h>
+  
+! #if defined(__FreeBSD__)
+  # define USE_TOD
+  #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
+  # define TIMES
+--- 82,88 ----
+  #include <openssl/rand.h>
+  #include <openssl/err.h>
+  
+! #if defined(__FreeBSD__) || defined(__NetBSD__)
+  # define USE_TOD
+  #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
+  # define TIMES
diff --git a/security/openssl/pkg/PLIST.common b/security/openssl/pkg/PLIST.common
index e13d04e3021..0675f18df5b 100644
--- a/security/openssl/pkg/PLIST.common
+++ b/security/openssl/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2000/05/10 12:28:45 veego Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2001/04/09 04:29:24 fredb Exp $
 bin/CA.pl
 bin/CA.sh
 bin/asn1parse
@@ -140,38 +140,61 @@ lib/libcrypto.a
 lib/libssl.a
 share/doc/openssl/README
 share/doc/openssl/apps/CA.pl.pod
-share/doc/openssl/apps/crl.pod
-share/doc/openssl/apps/dsaparam.pod
-share/doc/openssl/apps/openssl.pod
-share/doc/openssl/apps/rand.pod
-share/doc/openssl/apps/sess_id.pod
-share/doc/openssl/apps/version.pod
 share/doc/openssl/apps/asn1parse.pod
-share/doc/openssl/apps/crl2pkcs7.pod
-share/doc/openssl/apps/enc.pod
-share/doc/openssl/apps/passwd.pod
-share/doc/openssl/apps/req.pod
-share/doc/openssl/apps/smime.pod
-share/doc/openssl/apps/x509.pod
 share/doc/openssl/apps/ca.pod
-share/doc/openssl/apps/dgst.pod
-share/doc/openssl/apps/gendsa.pod
-share/doc/openssl/apps/pkcs12.pod
-share/doc/openssl/apps/rsa.pod
-share/doc/openssl/apps/speed.pod
 share/doc/openssl/apps/ciphers.pod
-share/doc/openssl/apps/dhparam.pod
-share/doc/openssl/apps/genrsa.pod
-share/doc/openssl/apps/pkcs7.pod
-share/doc/openssl/apps/s_client.pod
-share/doc/openssl/apps/spkac.pod
 share/doc/openssl/apps/config.pod
+share/doc/openssl/apps/crl.pod
+share/doc/openssl/apps/crl2pkcs7.pod
+share/doc/openssl/apps/dgst.pod
+share/doc/openssl/apps/dhparam.pod
 share/doc/openssl/apps/dsa.pod
+share/doc/openssl/apps/dsaparam.pod
+share/doc/openssl/apps/enc.pod
+share/doc/openssl/apps/gendsa.pod
+share/doc/openssl/apps/genrsa.pod
 share/doc/openssl/apps/nseq.pod
+share/doc/openssl/apps/openssl.pod
+share/doc/openssl/apps/passwd.pod
+share/doc/openssl/apps/pkcs12.pod
+share/doc/openssl/apps/pkcs7.pod
 share/doc/openssl/apps/pkcs8.pod
+share/doc/openssl/apps/rand.pod
+share/doc/openssl/apps/req.pod
+share/doc/openssl/apps/rsa.pod
+share/doc/openssl/apps/rsautl.pod
+share/doc/openssl/apps/s_client.pod
 share/doc/openssl/apps/s_server.pod
+share/doc/openssl/apps/sess_id.pod
+share/doc/openssl/apps/smime.pod
+share/doc/openssl/apps/speed.pod
+share/doc/openssl/apps/spkac.pod
 share/doc/openssl/apps/verify.pod
+share/doc/openssl/apps/version.pod
+share/doc/openssl/apps/x509.pod
 share/doc/openssl/c-indentation.el
+share/doc/openssl/crypto/BIO_ctrl.pod
+share/doc/openssl/crypto/BIO_f_base64.pod
+share/doc/openssl/crypto/BIO_f_buffer.pod
+share/doc/openssl/crypto/BIO_f_cipher.pod
+share/doc/openssl/crypto/BIO_f_md.pod
+share/doc/openssl/crypto/BIO_f_null.pod
+share/doc/openssl/crypto/BIO_f_ssl.pod
+share/doc/openssl/crypto/BIO_find_type.pod
+share/doc/openssl/crypto/BIO_new.pod
+share/doc/openssl/crypto/BIO_new_bio_pair.pod
+share/doc/openssl/crypto/BIO_push.pod
+share/doc/openssl/crypto/BIO_read.pod
+share/doc/openssl/crypto/BIO_s_accept.pod
+share/doc/openssl/crypto/BIO_s_bio.pod
+share/doc/openssl/crypto/BIO_s_connect.pod
+share/doc/openssl/crypto/BIO_s_fd.pod
+share/doc/openssl/crypto/BIO_s_file.pod
+share/doc/openssl/crypto/BIO_s_mem.pod
+share/doc/openssl/crypto/BIO_s_null.pod
+share/doc/openssl/crypto/BIO_s_socket.pod
+share/doc/openssl/crypto/BIO_set_callback.pod
+share/doc/openssl/crypto/BIO_should_retry.pod
 share/doc/openssl/crypto/BN_CTX_new.pod
 share/doc/openssl/crypto/BN_CTX_start.pod
 share/doc/openssl/crypto/BN_add.pod
@@ -241,6 +264,7 @@ share/doc/openssl/crypto/RSA_set_method.pod
 share/doc/openssl/crypto/RSA_sign.pod
 share/doc/openssl/crypto/RSA_sign_ASN1_OCTET_STRING.pod
 share/doc/openssl/crypto/RSA_size.pod
+share/doc/openssl/crypto/bio.pod
 share/doc/openssl/crypto/blowfish.pod
 share/doc/openssl/crypto/bn.pod
 share/doc/openssl/crypto/bn_internal.pod
@@ -253,6 +277,7 @@ share/doc/openssl/crypto/des_modes.pod
 share/doc/openssl/crypto/dh.pod
 share/doc/openssl/crypto/dsa.pod
 share/doc/openssl/crypto/err.pod
+share/doc/openssl/crypto/evp.pod
 share/doc/openssl/crypto/hmac.pod
 share/doc/openssl/crypto/lh_stats.pod
 share/doc/openssl/crypto/lhash.pod
@@ -267,7 +292,35 @@ share/doc/openssl/crypto/threads.pod
 share/doc/openssl/openssl.txt
 share/doc/openssl/openssl_button.gif
 share/doc/openssl/openssl_button.html
+share/doc/openssl/ssl/SSL_CIPHER_get_name.pod
+share/doc/openssl/ssl/SSL_CTX_free.pod
+share/doc/openssl/ssl/SSL_CTX_new.pod
+share/doc/openssl/ssl/SSL_CTX_set_cipher_list.pod
+share/doc/openssl/ssl/SSL_CTX_set_ssl_version.pod
+share/doc/openssl/ssl/SSL_SESSION_free.pod
+share/doc/openssl/ssl/SSL_accept.pod
+share/doc/openssl/ssl/SSL_clear.pod
+share/doc/openssl/ssl/SSL_connect.pod
+share/doc/openssl/ssl/SSL_free.pod
+share/doc/openssl/ssl/SSL_get_ciphers.pod
+share/doc/openssl/ssl/SSL_get_current_cipher.pod
 share/doc/openssl/ssl/SSL_get_error.pod
+share/doc/openssl/ssl/SSL_get_fd.pod
+share/doc/openssl/ssl/SSL_get_peer_cert_chain.pod
+share/doc/openssl/ssl/SSL_get_peer_certificate.pod
+share/doc/openssl/ssl/SSL_get_rbio.pod
+share/doc/openssl/ssl/SSL_get_session.pod
+share/doc/openssl/ssl/SSL_get_verify_result.pod
+share/doc/openssl/ssl/SSL_library_init.pod
+share/doc/openssl/ssl/SSL_new.pod
+share/doc/openssl/ssl/SSL_pending.pod
+share/doc/openssl/ssl/SSL_read.pod
+share/doc/openssl/ssl/SSL_set_bio.pod
+share/doc/openssl/ssl/SSL_set_fd.pod
+share/doc/openssl/ssl/SSL_set_session.pod
+share/doc/openssl/ssl/SSL_set_verify_result.pod
+share/doc/openssl/ssl/SSL_shutdown.pod
+share/doc/openssl/ssl/SSL_write.pod
 share/doc/openssl/ssl/ssl.pod
 share/doc/openssl/ssleay.txt
 @exec mkdir -p %D/certs %D/private