Update security/openssl to 0.9.7e. Changes from openssl-0.9.6m are

too numerous to be listed here, but include adding a new DES API
(support for the old one is still present).

Changes to the pkgsrc structure include:

* Install the shared libraries with a version number that matches the
  OpenSSL version number

* Move some of the less often-used c_* utilities back into the examples
  directory.

* Drop support for using the RSAREF library and always use the built-in
  RSA code instead.

18 files changed, 961 insertions, 395 deletions

diff --git a/security/openssl/DESCR b/security/openssl/DESCR
index b87d3d21739..a779c6b260e 100644
--- a/security/openssl/DESCR
+++ b/security/openssl/DESCR
@@ -1 +1,7 @@
-This is a Ruby module for OpenSSL, handling SSL sockets and more.
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing
+the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
+v1) protocols as well as a full-strength general purpose cryptography
+library.  The project is managed by a worldwide community of volunteers
+that use the Internet to communicate, plan, and develop the OpenSSL
+toolkit and its related documentation.
diff --git a/security/openssl/MESSAGE b/security/openssl/MESSAGE
deleted file mode 100644
index eb596416202..00000000000
--- a/security/openssl/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2003/09/22 03:13:58 grant Exp $
-
-If upgrading from SSLeay, you will need to copy your ssleay.cnf (used for
-creating certificate requests with "ca") into
-${PKG_SYSCONFDIR}/openssl.cnf.
-
-If installing from scratch, you may want to take a look
-at ${PREFIX}/share/examples/openssl/openssl.cnf copy it
-to ${PKG_SYSCONFDIR}/openssl.cnf, and customize it.
-
-===========================================================================
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index a78650b413f..55a26a52803 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,62 +1,46 @@
-# $NetBSD: Makefile,v 1.97 2004/12/17 23:08:36 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2004/12/24 22:02:38 jlam Exp $
 
-DISTNAME=		openssl-0.9.6m
-PKGREVISION=		2
-SVR4_PKGNAME=		ossl
-CATEGORIES=		security
-MASTER_SITES=		http://mirrors.isc.org/pub/openssl/source/ \
-			http://www.mirrors.wiretapped.net/security/cryptography/libraries/tls/openssl/ \
-			http://sunsite.rediris.es/pub/mirror/OpenSSL/ \
-			http://ftp.wayne.edu/pub/openssl/source/ \
-			http://www.binarycode.org/openssl/source/ \
-			ftp://ftp.openssl.org/source/
+DISTNAME=	openssl-0.9.7e
+SVR4_PKGNAME=	ossl
+CATEGORIES=	security
+MASTER_SITES=	http://mirrors.isc.org/pub/openssl/source/ \
+		http://www.mirrors.wiretapped.net/security/cryptography/libraries/tls/openssl/ \
+		http://sunsite.rediris.es/pub/mirror/OpenSSL/ \
+		http://ftp.wayne.edu/pub/openssl/source/ \
+		http://www.binarycode.org/openssl/source/ \
+		ftp://ftp.openssl.org/source/
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.openssl.org/
-COMMENT=		Secure Socket Layer and cryptographic library
+MAINTAINER=	jlam@NetBSD.org
+HOMEPAGE=	http://www.openssl.org/
+COMMENT=	Secure Socket Layer and cryptographic library
 
-CONFLICTS=		SSLeay-[0-9]* ssleay-[0-9]*
+CONFLICTS=	SSLeay-[0-9]* ssleay-[0-9]*
 
-CRYPTO=			YES
+CRYPTO=		yes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-.include "../../mk/compiler.mk"
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+
+USE_PERL5=		build	# perl is used throughout the build
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+USE_GNU_TOOLS+=		make
+TEST_TARGET=		tests
 
-USE_PERL5=		build
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
-HAS_CONFIGURE=		YES
+HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	shared
+
 # IDEA, RC5, and MDC2 are disabled due to licensing and/or patent issues.
 CONFIGURE_ARGS+=	no-idea no-rc5 no-mdc2
 
-# Global and legacy options
-.if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	rsaref
-.endif
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.openssl
-PKG_SUPPORTED_OPTIONS=	rsaref
-.include "../../mk/bsd.options.mk"
-
-###
-### Use the RSA reference package instead of the built-in code for the
-### RSA algorithm (NOT RECOMMENDED!).
-###
-.if !empty(PKG_OPTIONS:Mrsaref)
-.  include "../../security/rsaref/buildlink3.mk"
-CONFIGURE_ARGS+=	rsaref
-PLIST_RSAREF=		${PKGDIR}/PLIST.rsaref
-.endif
-
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
 CONFIGURE_SCRIPT=	./Configure
-.  if !empty(CC:M*gcc*)
+.  if !empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=	solaris-${SPARC_TARGET_ARCH}-gcc
 .  else
 CONFIGURE_ARGS+=	solaris-${SPARC_TARGET_ARCH}-cc
@@ -73,36 +57,25 @@ CONFIGURE_ARGS+=	${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=		PERL="${PERL5}"
 CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
-PLIST_OPSYS=		${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}	
+PLIST_OPSYS=		${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//}
 .if exists(${PLIST_OPSYS})
 PLIST_SHLIB=		${PLIST_OPSYS}
 .else
 PLIST_SHLIB=		${PKGDIR}/PLIST.shlib
 .endif
-
 PLIST_SRC=		${PLIST_SHLIB}
-PLIST_SRC+=		${PLIST_RSAREF}
 PLIST_SRC+=		${PKGDIR}/PLIST.common
-
-PKG_SYSCONFSUBDIR=	openssl
-CONF_FILES=		${PREFIX}/share/examples/openssl/openssl.cnf	\
-			${PKG_SYSCONFDIR}/openssl.cnf
-OWN_DIRS=		${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
+PLIST_SUBST+=		SHLIB_VERSION=${DISTNAME:S/openssl-//:C/[^0-9]*$//}
+PLIST_SUBST+=		SHLIB_MAJOR=${DISTNAME:S/openssl-//:C/\..*$//}
 
 .if ${OPSYS} == "NetBSD"
 PKG_SYSCONFDIR.openssl?=	/etc/openssl
-.  if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
-PKG_FAIL_REASON=	${PKGNAME} requires shared object support
-.  endif
 .endif
 
-.if ${OPSYS} == "Darwin"
-LD_PATH_VARNAME=	DYLD_LIBRARY_PATH
-.else
-LD_PATH_VARNAME=	LD_LIBRARY_PATH
-.endif
-TEST_ENV+=		${LD_PATH_VARNAME}=${WRKSRC}
-TEST_TARGET=		tests
+PKG_SYSCONFSUBDIR=	openssl
+CONF_FILES=		${PREFIX}/share/examples/openssl/openssl.cnf	\
+			${PKG_SYSCONFDIR}/openssl.cnf
+OWN_DIRS=		${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
 
 pre-configure:
 	cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
diff --git a/security/openssl/PLIST.aix b/security/openssl/PLIST.aix
deleted file mode 100644
index 95b85a32c49..00000000000
--- a/security/openssl/PLIST.aix
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST.aix,v 1.1 2003/12/03 17:35:43 erh Exp $
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index f80db3d522e..6c0c92a95b1 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST.common,v 1.8 2004/12/17 23:08:36 wiz Exp $
-bin/openssl
-bin/c_hash
-bin/c_info
-bin/c_issuer
-bin/c_name
+@comment $NetBSD: PLIST.common,v 1.9 2004/12/24 22:02:38 jlam Exp $
 bin/c_rehash
+bin/openssl
+bin/openssl_fips_fingerprint
+include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
+include/openssl/asn1t.h
 include/openssl/bio.h
 include/openssl/blowfish.h
 include/openssl/bn.h
@@ -17,23 +16,31 @@ include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/crypto.h
 include/openssl/des.h
+include/openssl/des_old.h
 include/openssl/dh.h
 include/openssl/dsa.h
 include/openssl/dso.h
-include/openssl/e_os.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
+include/openssl/ec.h
+include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
+include/openssl/fips.h
+include/openssl/fips_rand.h
 include/openssl/hmac.h
+include/openssl/krb5_asn.h
+include/openssl/kssl.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
+include/openssl/ocsp.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
+include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pkcs12.h
@@ -54,11 +61,14 @@ include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/tmdiff.h
 include/openssl/txt_db.h
+include/openssl/ui.h
+include/openssl/ui_compat.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
 lib/libcrypto.a
 lib/libssl.a
+lib/pkgconfig/openssl.pc
 man/man1/CA.pl.1
 man/man1/asn1parse.1
 man/man1/ca.1
@@ -72,7 +82,12 @@ man/man1/dsaparam.1
 man/man1/enc.1
 man/man1/gendsa.1
 man/man1/genrsa.1
+man/man1/md2.1
+man/man1/md4.1
+man/man1/md5.1
+man/man1/mdc2.1
 man/man1/nseq.1
+man/man1/ocsp.1
 man/man1/openssl.1
 man/man1/passwd.1
 man/man1/pkcs12.1
@@ -80,18 +95,56 @@ man/man1/pkcs7.1
 man/man1/pkcs8.1
 man/man1/rand.1
 man/man1/req.1
+man/man1/ripemd160.1
 man/man1/rsa.1
 man/man1/rsautl.1
 man/man1/s_client.1
 man/man1/s_server.1
+man/man1/s_time.1
 man/man1/sess_id.1
+man/man1/sha.1
+man/man1/sha1.1
 man/man1/smime.1
 man/man1/speed.1
 man/man1/spkac.1
 man/man1/verify.1
 man/man1/version.1
 man/man1/x509.1
+man/man3/ASN1_OBJECT_free.3
+man/man3/ASN1_OBJECT_new.3
+man/man3/ASN1_STRING_cmp.3
+man/man3/ASN1_STRING_data.3
+man/man3/ASN1_STRING_dup.3
+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_ex.3
+man/man3/ASN1_STRING_print_ex_fp.3
+man/man3/ASN1_STRING_set.3
+man/man3/ASN1_STRING_type.3
+man/man3/ASN1_STRING_type_new.3
+man/man3/BF_cbc_encrypt.3
+man/man3/BF_cfb64_encrypt.3
+man/man3/BF_decrypt.3
+man/man3/BF_ecb_encrypt.3
+man/man3/BF_encrypt.3
+man/man3/BF_ofb64_encrypt.3
+man/man3/BF_options.3
+man/man3/BF_set_key.3
+man/man3/BIO_append_filename.3
+man/man3/BIO_callback_ctrl.3
 man/man3/BIO_ctrl.3
+man/man3/BIO_ctrl_get_read_request.3
+man/man3/BIO_ctrl_get_write_guarantee.3
+man/man3/BIO_ctrl_pending.3
+man/man3/BIO_ctrl_reset_read_request.3
+man/man3/BIO_ctrl_wpending.3
+man/man3/BIO_debug_callback.3
+man/man3/BIO_destroy_bio_pair.3
+man/man3/BIO_do_accept.3
+man/man3/BIO_do_connect.3
+man/man3/BIO_eof.3
 man/man3/BIO_f_base64.3
 man/man3/BIO_f_buffer.3
 man/man3/BIO_f_cipher.3
@@ -99,10 +152,58 @@ man/man3/BIO_f_md.3
 man/man3/BIO_f_null.3
 man/man3/BIO_f_ssl.3
 man/man3/BIO_find_type.3
+man/man3/BIO_flush.3
+man/man3/BIO_free.3
+man/man3/BIO_free_all.3
+man/man3/BIO_get_accept_port.3
+man/man3/BIO_get_bind_mode.3
+man/man3/BIO_get_callback.3
+man/man3/BIO_get_callback_arg.3
+man/man3/BIO_get_cipher_ctx.3
+man/man3/BIO_get_cipher_status.3
+man/man3/BIO_get_close.3
+man/man3/BIO_get_conn_hostname.3
+man/man3/BIO_get_conn_int_port.3
+man/man3/BIO_get_conn_ip.3
+man/man3/BIO_get_conn_port.3
+man/man3/BIO_get_fd.3
+man/man3/BIO_get_fp.3
+man/man3/BIO_get_info_callback.3
+man/man3/BIO_get_md.3
+man/man3/BIO_get_md_ctx.3
+man/man3/BIO_get_mem_data.3
+man/man3/BIO_get_mem_ptr.3
+man/man3/BIO_get_num_renegotiates.3
+man/man3/BIO_get_read_request.3
+man/man3/BIO_get_retry_BIO.3
+man/man3/BIO_get_retry_reason.3
+man/man3/BIO_get_ssl.3
+man/man3/BIO_get_write_buf_size.3
+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_new.3
 man/man3/BIO_new_bio_pair.3
+man/man3/BIO_new_buffer_ssl_connect.3
+man/man3/BIO_new_fd.3
+man/man3/BIO_new_file.3
+man/man3/BIO_new_fp.3
+man/man3/BIO_new_mem_buf.3
+man/man3/BIO_new_socket.3
+man/man3/BIO_new_ssl.3
+man/man3/BIO_new_ssl_connect.3
+man/man3/BIO_next.3
+man/man3/BIO_pending.3
+man/man3/BIO_pop.3
+man/man3/BIO_ptr_ctrl.3
 man/man3/BIO_push.3
+man/man3/BIO_puts.3
 man/man3/BIO_read.3
+man/man3/BIO_read_filename.3
+man/man3/BIO_reset.3
+man/man3/BIO_retry_type.3
+man/man3/BIO_rw_filename.3
 man/man3/BIO_s_accept.3
 man/man3/BIO_s_bio.3
 man/man3/BIO_s_connect.3
@@ -111,91 +212,519 @@ man/man3/BIO_s_file.3
 man/man3/BIO_s_mem.3
 man/man3/BIO_s_null.3
 man/man3/BIO_s_socket.3
+man/man3/BIO_seek.3
+man/man3/BIO_set.3
+man/man3/BIO_set_accept_bios.3
+man/man3/BIO_set_accept_port.3
+man/man3/BIO_set_bind_mode.3
 man/man3/BIO_set_callback.3
+man/man3/BIO_set_callback_arg.3
+man/man3/BIO_set_cipher.3
+man/man3/BIO_set_close.3
+man/man3/BIO_set_conn_hostname.3
+man/man3/BIO_set_conn_int_port.3
+man/man3/BIO_set_conn_ip.3
+man/man3/BIO_set_conn_port.3
+man/man3/BIO_set_fd.3
+man/man3/BIO_set_fp.3
+man/man3/BIO_set_info_callback.3
+man/man3/BIO_set_md.3
+man/man3/BIO_set_mem_buf.3
+man/man3/BIO_set_mem_eof_return.3
+man/man3/BIO_set_nbio.3
+man/man3/BIO_set_nbio_accept.3
+man/man3/BIO_set_ssl.3
+man/man3/BIO_set_ssl_mode.3
+man/man3/BIO_set_ssl_renegotiate_bytes.3
+man/man3/BIO_set_ssl_renegotiate_timeout.3
+man/man3/BIO_set_write_buf_size.3
+man/man3/BIO_should_io_special.3
+man/man3/BIO_should_read.3
 man/man3/BIO_should_retry.3
+man/man3/BIO_should_write.3
+man/man3/BIO_shutdown_wr.3
+man/man3/BIO_ssl_copy_session_id.3
+man/man3/BIO_ssl_shutdown.3
+man/man3/BIO_tell.3
+man/man3/BIO_vfree.3
+man/man3/BIO_wpending.3
+man/man3/BIO_write.3
+man/man3/BIO_write_filename.3
+man/man3/BN_CTX_end.3
+man/man3/BN_CTX_free.3
+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_MONT_CTX_copy.3
+man/man3/BN_MONT_CTX_free.3
+man/man3/BN_MONT_CTX_init.3
+man/man3/BN_MONT_CTX_new.3
+man/man3/BN_MONT_CTX_set.3
+man/man3/BN_RECP_CTX_free.3
+man/man3/BN_RECP_CTX_init.3
+man/man3/BN_RECP_CTX_new.3
+man/man3/BN_RECP_CTX_set.3
 man/man3/BN_add.3
 man/man3/BN_add_word.3
+man/man3/BN_bin2bn.3
 man/man3/BN_bn2bin.3
+man/man3/BN_bn2dec.3
+man/man3/BN_bn2hex.3
+man/man3/BN_bn2mpi.3
+man/man3/BN_clear.3
+man/man3/BN_clear_bit.3
+man/man3/BN_clear_free.3
 man/man3/BN_cmp.3
 man/man3/BN_copy.3
+man/man3/BN_dec2bn.3
+man/man3/BN_div.3
+man/man3/BN_div_recp.3
+man/man3/BN_div_word.3
+man/man3/BN_dup.3
+man/man3/BN_exp.3
+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_get_word.3
+man/man3/BN_hex2bn.3
+man/man3/BN_init.3
+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_fasttest.3
+man/man3/BN_is_word.3
+man/man3/BN_is_zero.3
+man/man3/BN_lshift.3
+man/man3/BN_lshift1.3
+man/man3/BN_mask_bits.3
+man/man3/BN_mod.3
+man/man3/BN_mod_add.3
+man/man3/BN_mod_exp.3
 man/man3/BN_mod_inverse.3
+man/man3/BN_mod_mul.3
 man/man3/BN_mod_mul_montgomery.3
 man/man3/BN_mod_mul_reciprocal.3
+man/man3/BN_mod_sqr.3
+man/man3/BN_mod_sub.3
+man/man3/BN_mod_word.3
+man/man3/BN_mpi2bn.3
+man/man3/BN_mul.3
+man/man3/BN_mul_word.3
 man/man3/BN_new.3
+man/man3/BN_nnmod.3
+man/man3/BN_num_bits.3
+man/man3/BN_num_bits_word.3
 man/man3/BN_num_bytes.3
+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_rand.3
+man/man3/BN_rshift.3
+man/man3/BN_rshift1.3
 man/man3/BN_set_bit.3
+man/man3/BN_set_word.3
+man/man3/BN_sqr.3
+man/man3/BN_sub.3
+man/man3/BN_sub_word.3
+man/man3/BN_swap.3
+man/man3/BN_to_montgomery.3
+man/man3/BN_ucmp.3
+man/man3/BN_value_one.3
 man/man3/BN_zero.3
+man/man3/BUF_MEM_free.3
+man/man3/BUF_MEM_grow.3
+man/man3/BUF_MEM_new.3
+man/man3/BUF_strdup.3
+man/man3/CONF_modules_free.3
+man/man3/CONF_modules_load.3
+man/man3/CONF_modules_load_file.3
+man/man3/CONF_modules_unload.3
+man/man3/CRYPTO_destroy_dynlockid.3
+man/man3/CRYPTO_get_ex_data.3
+man/man3/CRYPTO_get_new_dynlockid.3
+man/man3/CRYPTO_lock.3
+man/man3/CRYPTO_num_locks.3
+man/man3/CRYPTO_set_dynlock_create_callback.3
+man/man3/CRYPTO_set_dynlock_destroy_callback.3
+man/man3/CRYPTO_set_dynlock_lock_callback.3
 man/man3/CRYPTO_set_ex_data.3
+man/man3/CRYPTO_set_id_callback.3
+man/man3/CRYPTO_set_locking_callback.3
+man/man3/DES_cbc_cksum.3
+man/man3/DES_cfb64_encrypt.3
+man/man3/DES_cfb_encrypt.3
+man/man3/DES_crypt.3
+man/man3/DES_ecb2_encrypt.3
+man/man3/DES_ecb3_encrypt.3
+man/man3/DES_ecb_encrypt.3
+man/man3/DES_ede2_cbc_encrypt.3
+man/man3/DES_ede2_cfb64_encrypt.3
+man/man3/DES_ede2_ofb64_encrypt.3
+man/man3/DES_ede3_cbc_encrypt.3
+man/man3/DES_ede3_cbcm_encrypt.3
+man/man3/DES_ede3_cfb64_encrypt.3
+man/man3/DES_ede3_ofb64_encrypt.3
+man/man3/DES_enc_read.3
+man/man3/DES_enc_write.3
+man/man3/DES_fcrypt.3
+man/man3/DES_is_weak_key.3
+man/man3/DES_key_sched.3
+man/man3/DES_ncbc_encrypt.3
+man/man3/DES_ofb64_encrypt.3
+man/man3/DES_ofb_encrypt.3
+man/man3/DES_pcbc_encrypt.3
+man/man3/DES_quad_cksum.3
+man/man3/DES_random_key.3
+man/man3/DES_set_key.3
+man/man3/DES_set_key_checked.3
+man/man3/DES_set_key_unchecked.3
+man/man3/DES_set_odd_parity.3
+man/man3/DES_string_to_2keys.3
+man/man3/DES_string_to_key.3
+man/man3/DES_xcbc_encrypt.3
+man/man3/DH_OpenSSL.3
+man/man3/DH_check.3
+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_get_default_method.3
+man/man3/DH_get_ex_data.3
 man/man3/DH_get_ex_new_index.3
 man/man3/DH_new.3
+man/man3/DH_new_method.3
+man/man3/DH_set_default_method.3
+man/man3/DH_set_ex_data.3
 man/man3/DH_set_method.3
 man/man3/DH_size.3
+man/man3/DHparams_print.3
+man/man3/DHparams_print_fp.3
+man/man3/DSA_OpenSSL.3
+man/man3/DSA_SIG_free.3
 man/man3/DSA_SIG_new.3
 man/man3/DSA_do_sign.3
+man/man3/DSA_do_verify.3
 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_get_default_method.3
+man/man3/DSA_get_ex_data.3
 man/man3/DSA_get_ex_new_index.3
 man/man3/DSA_new.3
+man/man3/DSA_new_method.3
+man/man3/DSA_print.3
+man/man3/DSA_print_fp.3
+man/man3/DSA_set_default_method.3
+man/man3/DSA_set_ex_data.3
 man/man3/DSA_set_method.3
 man/man3/DSA_sign.3
+man/man3/DSA_sign_setup.3
 man/man3/DSA_size.3
+man/man3/DSA_verify.3
+man/man3/DSAparams_print.3
+man/man3/DSAparams_print_fp.3
+man/man3/ERR_GET_FUNC.3
 man/man3/ERR_GET_LIB.3
+man/man3/ERR_GET_REASON.3
+man/man3/ERR_PACK.3
+man/man3/ERR_add_error_data.3
 man/man3/ERR_clear_error.3
 man/man3/ERR_error_string.3
+man/man3/ERR_error_string_n.3
+man/man3/ERR_free_strings.3
+man/man3/ERR_func_error_string.3
 man/man3/ERR_get_error.3
+man/man3/ERR_get_error_line.3
+man/man3/ERR_get_error_line_data.3
+man/man3/ERR_get_next_error_library.3
+man/man3/ERR_lib_error_string.3
+man/man3/ERR_load_UI_strings.3
 man/man3/ERR_load_crypto_strings.3
 man/man3/ERR_load_strings.3
+man/man3/ERR_peek_error.3
+man/man3/ERR_peek_error_line.3
+man/man3/ERR_peek_error_line_data.3
+man/man3/ERR_peek_last_error.3
+man/man3/ERR_peek_last_error_line.3
+man/man3/ERR_peek_last_error_line_data.3
 man/man3/ERR_print_errors.3
+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/EVP_BytesToKey.3
+man/man3/EVP_CIPHER_CTX_block_size.3
+man/man3/EVP_CIPHER_CTX_cipher.3
+man/man3/EVP_CIPHER_CTX_cleanup.3
+man/man3/EVP_CIPHER_CTX_ctrl.3
+man/man3/EVP_CIPHER_CTX_flags.3
+man/man3/EVP_CIPHER_CTX_get_app_data.3
+man/man3/EVP_CIPHER_CTX_init.3
+man/man3/EVP_CIPHER_CTX_iv_length.3
+man/man3/EVP_CIPHER_CTX_key_length.3
+man/man3/EVP_CIPHER_CTX_mode.3
+man/man3/EVP_CIPHER_CTX_nid.3
+man/man3/EVP_CIPHER_CTX_set_app_data.3
+man/man3/EVP_CIPHER_CTX_set_key_length.3
+man/man3/EVP_CIPHER_CTX_set_padding.3
+man/man3/EVP_CIPHER_CTX_type.3
+man/man3/EVP_CIPHER_asn1_to_param.3
+man/man3/EVP_CIPHER_block_size.3
+man/man3/EVP_CIPHER_flags.3
+man/man3/EVP_CIPHER_iv_length.3
+man/man3/EVP_CIPHER_key_length.3
+man/man3/EVP_CIPHER_mode.3
+man/man3/EVP_CIPHER_nid.3
+man/man3/EVP_CIPHER_param_to_asn1.3
+man/man3/EVP_CIPHER_type.3
+man/man3/EVP_CipherFinal.3
+man/man3/EVP_CipherFinal_ex.3
+man/man3/EVP_CipherInit.3
+man/man3/EVP_CipherInit_ex.3
+man/man3/EVP_CipherUpdate.3
+man/man3/EVP_DecryptFinal.3
+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_ex.3
 man/man3/EVP_DigestInit.3
+man/man3/EVP_DigestInit_ex.3
+man/man3/EVP_DigestUpdate.3
+man/man3/EVP_EncryptFinal.3
+man/man3/EVP_EncryptFinal_ex.3
 man/man3/EVP_EncryptInit.3
+man/man3/EVP_EncryptInit_ex.3
+man/man3/EVP_EncryptUpdate.3
+man/man3/EVP_MAX_MD_SIZE.3
+man/man3/EVP_MD_CTX_block_size.3
+man/man3/EVP_MD_CTX_cleanup.3
+man/man3/EVP_MD_CTX_copy.3
+man/man3/EVP_MD_CTX_copy_ex.3
+man/man3/EVP_MD_CTX_create.3
+man/man3/EVP_MD_CTX_destroy.3
+man/man3/EVP_MD_CTX_init.3
+man/man3/EVP_MD_CTX_md.3
+man/man3/EVP_MD_CTX_size.3
+man/man3/EVP_MD_CTX_type.3
+man/man3/EVP_MD_block_size.3
+man/man3/EVP_MD_pkey_type.3
+man/man3/EVP_MD_size.3
+man/man3/EVP_MD_type.3
+man/man3/EVP_OpenFinal.3
 man/man3/EVP_OpenInit.3
+man/man3/EVP_OpenUpdate.3
+man/man3/EVP_PKEY_assign_DH.3
+man/man3/EVP_PKEY_assign_DSA.3
+man/man3/EVP_PKEY_assign_EC_KEY.3
+man/man3/EVP_PKEY_assign_RSA.3
+man/man3/EVP_PKEY_free.3
+man/man3/EVP_PKEY_get1_DH.3
+man/man3/EVP_PKEY_get1_DSA.3
+man/man3/EVP_PKEY_get1_EC_KEY.3
+man/man3/EVP_PKEY_get1_RSA.3
+man/man3/EVP_PKEY_new.3
+man/man3/EVP_PKEY_set1_DH.3
+man/man3/EVP_PKEY_set1_DSA.3
+man/man3/EVP_PKEY_set1_EC_KEY.3
+man/man3/EVP_PKEY_set1_RSA.3
+man/man3/EVP_PKEY_type.3
+man/man3/EVP_SealFinal.3
 man/man3/EVP_SealInit.3
+man/man3/EVP_SealUpdate.3
+man/man3/EVP_SignFinal.3
 man/man3/EVP_SignInit.3
+man/man3/EVP_SignUpdate.3
+man/man3/EVP_VerifyFinal.3
 man/man3/EVP_VerifyInit.3
+man/man3/EVP_VerifyUpdate.3
+man/man3/EVP_dss.3
+man/man3/EVP_dss1.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_md2.3
+man/man3/EVP_md5.3
+man/man3/EVP_md_null.3
+man/man3/EVP_mdc2.3
+man/man3/EVP_ripemd160.3
+man/man3/EVP_sha.3
+man/man3/EVP_sha1.3
+man/man3/HMAC.3
+man/man3/HMAC_Final.3
+man/man3/HMAC_Init.3
+man/man3/HMAC_Update.3
+man/man3/HMAC_cleanup.3
+man/man3/MD2.3
+man/man3/MD2_Final.3
+man/man3/MD2_Init.3
+man/man3/MD2_Update.3
+man/man3/MD4.3
+man/man3/MD4_Final.3
+man/man3/MD4_Init.3
+man/man3/MD4_Update.3
+man/man3/MD5.3
+man/man3/MD5_Final.3
+man/man3/MD5_Init.3
+man/man3/MD5_Update.3
+man/man3/MDC2.3
+man/man3/MDC2_Final.3
+man/man3/MDC2_Init.3
+man/man3/MDC2_Update.3
+man/man3/OBJ_cleanup.3
+man/man3/OBJ_cmp.3
+man/man3/OBJ_create.3
+man/man3/OBJ_dup.3
+man/man3/OBJ_ln2nid.3
+man/man3/OBJ_nid2ln.3
+man/man3/OBJ_nid2obj.3
+man/man3/OBJ_nid2sn.3
+man/man3/OBJ_obj2nid.3
+man/man3/OBJ_obj2txt.3
+man/man3/OBJ_sn2nid.3
+man/man3/OBJ_txt2nid.3
+man/man3/OBJ_txt2obj.3
 man/man3/OPENSSL_VERSION_NUMBER.3
+man/man3/OPENSSL_config.3
+man/man3/OPENSSL_load_builtin_modules.3
+man/man3/OPENSSL_no_config.3
 man/man3/OpenSSL_add_all_algorithms.3
+man/man3/OpenSSL_add_all_ciphers.3
+man/man3/OpenSSL_add_all_digests.3
+man/man3/OpenSSL_add_ssl_algorithms.3
+man/man3/PEM.3
+man/man3/PKCS12_create.3
+man/man3/PKCS12_parse.3
+man/man3/PKCS7_decrypt.3
+man/man3/PKCS7_encrypt.3
+man/man3/PKCS7_sign.3
+man/man3/PKCS7_verify.3
+man/man3/RAND_SSLeay.3
 man/man3/RAND_add.3
 man/man3/RAND_bytes.3
 man/man3/RAND_cleanup.3
 man/man3/RAND_egd.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_screen.3
+man/man3/RAND_seed.3
 man/man3/RAND_set_rand_method.3
+man/man3/RAND_status.3
+man/man3/RAND_write_file.3
+man/man3/RC4.3
+man/man3/RC4_set_key.3
+man/man3/RIPEMD160.3
+man/man3/RIPEMD160_Final.3
+man/man3/RIPEMD160_Init.3
+man/man3/RIPEMD160_Update.3
+man/man3/RSA_PKCS1_SSLeay.3
+man/man3/RSA_blinding_off.3
 man/man3/RSA_blinding_on.3
 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_get_default_method.3
+man/man3/RSA_get_ex_data.3
 man/man3/RSA_get_ex_new_index.3
+man/man3/RSA_get_method.3
 man/man3/RSA_new.3
+man/man3/RSA_new_method.3
+man/man3/RSA_null_method.3
+man/man3/RSA_padding_add_PKCS1_OAEP.3
 man/man3/RSA_padding_add_PKCS1_type_1.3
+man/man3/RSA_padding_add_PKCS1_type_2.3
+man/man3/RSA_padding_add_SSLv23.3
+man/man3/RSA_padding_add_none.3
+man/man3/RSA_padding_check_PKCS1_OAEP.3
+man/man3/RSA_padding_check_PKCS1_type_1.3
+man/man3/RSA_padding_check_PKCS1_type_2.3
+man/man3/RSA_padding_check_SSLv23.3
+man/man3/RSA_padding_check_none.3
 man/man3/RSA_print.3
+man/man3/RSA_print_fp.3
+man/man3/RSA_private_decrypt.3
 man/man3/RSA_private_encrypt.3
+man/man3/RSA_public_decrypt.3
 man/man3/RSA_public_encrypt.3
+man/man3/RSA_set_default_method.3
+man/man3/RSA_set_ex_data.3
 man/man3/RSA_set_method.3
 man/man3/RSA_sign.3
 man/man3/RSA_sign_ASN1_OCTET_STRING.3
 man/man3/RSA_size.3
+man/man3/RSA_verify.3
+man/man3/RSA_verify_ASN1_OCTET_STRING.3
+man/man3/SHA1.3
+man/man3/SHA1_Final.3
+man/man3/SHA1_Init.3
+man/man3/SHA1_Update.3
+man/man3/SMIME_read_PKCS7.3
+man/man3/SMIME_write_PKCS7.3
+man/man3/SSL.3
+man/man3/SSL_CIPHER_description.3
+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_CTX_add_client_CA.3
 man/man3/SSL_CTX_add_extra_chain_cert.3
 man/man3/SSL_CTX_add_session.3
+man/man3/SSL_CTX_callback_ctrl.3
+man/man3/SSL_CTX_check_private_key.3
 man/man3/SSL_CTX_ctrl.3
 man/man3/SSL_CTX_flush_sessions.3
 man/man3/SSL_CTX_free.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
+man/man3/SSL_CTX_get_ex_data.3
 man/man3/SSL_CTX_get_ex_new_index.3
+man/man3/SSL_CTX_get_info_callback.3
+man/man3/SSL_CTX_get_max_cert_list.3
+man/man3/SSL_CTX_get_mode.3
+man/man3/SSL_CTX_get_options.3
+man/man3/SSL_CTX_get_quiet_shutdown.3
+man/man3/SSL_CTX_get_session_cache_mode.3
+man/man3/SSL_CTX_get_timeout.3
+man/man3/SSL_CTX_get_verify_callback.3
+man/man3/SSL_CTX_get_verify_depth.3
 man/man3/SSL_CTX_get_verify_mode.3
 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_sess_accept.3
+man/man3/SSL_CTX_sess_accept_good.3
+man/man3/SSL_CTX_sess_accept_renegotiate.3
+man/man3/SSL_CTX_sess_cache_full.3
+man/man3/SSL_CTX_sess_cb_hits.3
+man/man3/SSL_CTX_sess_connect.3
+man/man3/SSL_CTX_sess_connect_good.3
+man/man3/SSL_CTX_sess_connect_renegotiate.3
+man/man3/SSL_CTX_sess_get_cache_size.3
+man/man3/SSL_CTX_sess_get_get_cb.3
+man/man3/SSL_CTX_sess_get_new_cb.3
+man/man3/SSL_CTX_sess_get_remove_cb.3
+man/man3/SSL_CTX_sess_hits.3
+man/man3/SSL_CTX_sess_misses.3
 man/man3/SSL_CTX_sess_number.3
 man/man3/SSL_CTX_sess_set_cache_size.3
 man/man3/SSL_CTX_sess_set_get_cb.3
+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_set_cert_store.3
 man/man3/SSL_CTX_set_cert_verify_callback.3
@@ -203,78 +732,313 @@ 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_default_passwd_cb.3
+man/man3/SSL_CTX_set_default_passwd_cb_userdata.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
+man/man3/SSL_CTX_set_max_cert_list.3
 man/man3/SSL_CTX_set_mode.3
+man/man3/SSL_CTX_set_msg_callback.3
+man/man3/SSL_CTX_set_msg_callback_arg.3
 man/man3/SSL_CTX_set_options.3
 man/man3/SSL_CTX_set_quiet_shutdown.3
 man/man3/SSL_CTX_set_session_cache_mode.3
 man/man3/SSL_CTX_set_session_id_context.3
 man/man3/SSL_CTX_set_ssl_version.3
 man/man3/SSL_CTX_set_timeout.3
+man/man3/SSL_CTX_set_tmp_dh.3
 man/man3/SSL_CTX_set_tmp_dh_callback.3
+man/man3/SSL_CTX_set_tmp_rsa.3
 man/man3/SSL_CTX_set_tmp_rsa_callback.3
 man/man3/SSL_CTX_set_verify.3
+man/man3/SSL_CTX_set_verify_depth.3
+man/man3/SSL_CTX_use_PrivateKey.3
+man/man3/SSL_CTX_use_PrivateKey_ASN1.3
+man/man3/SSL_CTX_use_PrivateKey_file.3
+man/man3/SSL_CTX_use_RSAPrivateKey.3
+man/man3/SSL_CTX_use_RSAPrivateKey_ASN1.3
+man/man3/SSL_CTX_use_RSAPrivateKey_file.3
 man/man3/SSL_CTX_use_certificate.3
+man/man3/SSL_CTX_use_certificate_ASN1.3
+man/man3/SSL_CTX_use_certificate_chain_file.3
+man/man3/SSL_CTX_use_certificate_file.3
 man/man3/SSL_SESSION_free.3
+man/man3/SSL_SESSION_get_ex_data.3
 man/man3/SSL_SESSION_get_ex_new_index.3
 man/man3/SSL_SESSION_get_time.3
+man/man3/SSL_SESSION_get_timeout.3
+man/man3/SSL_SESSION_set_ex_data.3
+man/man3/SSL_SESSION_set_time.3
 man/man3/SSL_accept.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_callback_ctrl.3
+man/man3/SSL_check_private_key.3
 man/man3/SSL_clear.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_get_SSL_CTX.3
+man/man3/SSL_get_accept_state.3
+man/man3/SSL_get_cipher.3
+man/man3/SSL_get_cipher_bits.3
+man/man3/SSL_get_cipher_list.3
+man/man3/SSL_get_cipher_name.3
+man/man3/SSL_get_cipher_version.3
 man/man3/SSL_get_ciphers.3
 man/man3/SSL_get_client_CA_list.3
 man/man3/SSL_get_current_cipher.3
 man/man3/SSL_get_default_timeout.3
 man/man3/SSL_get_error.3
+man/man3/SSL_get_ex_data.3
 man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3
 man/man3/SSL_get_ex_new_index.3
 man/man3/SSL_get_fd.3
+man/man3/SSL_get_info_callback.3
+man/man3/SSL_get_max_cert_list.3
+man/man3/SSL_get_mode.3
+man/man3/SSL_get_msg_callback_arg.3
+man/man3/SSL_get_options.3
 man/man3/SSL_get_peer_cert_chain.3
 man/man3/SSL_get_peer_certificate.3
+man/man3/SSL_get_quiet_shutdown.3
 man/man3/SSL_get_rbio.3
 man/man3/SSL_get_session.3
+man/man3/SSL_get_shutdown.3
+man/man3/SSL_get_ssl_method.3
+man/man3/SSL_get_verify_callback.3
+man/man3/SSL_get_verify_depth.3
+man/man3/SSL_get_verify_mode.3
 man/man3/SSL_get_verify_result.3
 man/man3/SSL_get_version.3
+man/man3/SSL_has_matching_session_id.3
 man/man3/SSL_library_init.3
 man/man3/SSL_load_client_CA_file.3
+man/man3/SSL_load_error_strings.3
+man/man3/SSL_need_tmp_rsa.3
 man/man3/SSL_new.3
 man/man3/SSL_pending.3
 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_session_reused.3
 man/man3/SSL_set_bio.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_ex_data.3
 man/man3/SSL_set_fd.3
+man/man3/SSL_set_generate_session_id.3
+man/man3/SSL_set_info_callback.3
+man/man3/SSL_set_max_cert_list.3
+man/man3/SSL_set_mode.3
+man/man3/SSL_set_msg_callback.3
+man/man3/SSL_set_options.3
+man/man3/SSL_set_quiet_shutdown.3
 man/man3/SSL_set_session.3
+man/man3/SSL_set_session_id_context.3
 man/man3/SSL_set_shutdown.3
+man/man3/SSL_set_ssl_method.3
+man/man3/SSL_set_tmp_dh.3
+man/man3/SSL_set_tmp_dh_callback.3
+man/man3/SSL_set_tmp_rsa.3
+man/man3/SSL_set_tmp_rsa_callback.3
+man/man3/SSL_set_verify.3
+man/man3/SSL_set_verify_depth.3
 man/man3/SSL_set_verify_result.3
 man/man3/SSL_shutdown.3
 man/man3/SSL_state_string.3
+man/man3/SSL_state_string_long.3
+man/man3/SSL_use_PrivateKey.3
+man/man3/SSL_use_PrivateKey_ASN1.3
+man/man3/SSL_use_PrivateKey_file.3
+man/man3/SSL_use_RSAPrivateKey.3
+man/man3/SSL_use_RSAPrivateKey_ASN1.3
+man/man3/SSL_use_RSAPrivateKey_file.3
+man/man3/SSL_use_certificate.3
+man/man3/SSL_use_certificate_ASN1.3
+man/man3/SSL_use_certificate_file.3
 man/man3/SSL_want.3
+man/man3/SSL_want_nothing.3
+man/man3/SSL_want_read.3
+man/man3/SSL_want_write.3
+man/man3/SSL_want_x509_lookup.3
 man/man3/SSL_write.3
+man/man3/SSLeay.3
+man/man3/SSLeay_add_ssl_algorithms.3
+man/man3/SSLeay_version.3
+man/man3/UI_OpenSSL.3
+man/man3/UI_add_error_string.3
+man/man3/UI_add_info_string.3
+man/man3/UI_add_input_boolean.3
+man/man3/UI_add_input_string.3
+man/man3/UI_add_user_data.3
+man/man3/UI_add_verify_string.3
+man/man3/UI_construct_prompt.3
+man/man3/UI_ctrl.3
+man/man3/UI_dup_error_string.3
+man/man3/UI_dup_info_string.3
+man/man3/UI_dup_input_boolean.3
+man/man3/UI_dup_input_string.3
+man/man3/UI_dup_verify_string.3
+man/man3/UI_free.3
+man/man3/UI_get0_result.3
+man/man3/UI_get0_user_data.3
+man/man3/UI_get_default_method.3
+man/man3/UI_get_method.3
+man/man3/UI_new.3
+man/man3/UI_new_method.3
+man/man3/UI_process.3
+man/man3/UI_set_default_method.3
+man/man3/UI_set_method.3
+man/man3/X509_NAME_ENTRY_create_by_NID.3
+man/man3/X509_NAME_ENTRY_create_by_OBJ.3
+man/man3/X509_NAME_ENTRY_create_by_txt.3
+man/man3/X509_NAME_ENTRY_get_data.3
+man/man3/X509_NAME_ENTRY_get_object.3
+man/man3/X509_NAME_ENTRY_set_data.3
+man/man3/X509_NAME_ENTRY_set_object.3
+man/man3/X509_NAME_add_entry.3
+man/man3/X509_NAME_add_entry_by_NID.3
+man/man3/X509_NAME_add_entry_by_OBJ.3
+man/man3/X509_NAME_add_entry_by_txt.3
+man/man3/X509_NAME_delete_entry.3
+man/man3/X509_NAME_entry_count.3
+man/man3/X509_NAME_get_entry.3
+man/man3/X509_NAME_get_index_by_NID.3
+man/man3/X509_NAME_get_index_by_OBJ.3
+man/man3/X509_NAME_get_text_by_NID.3
+man/man3/X509_NAME_get_text_by_OBJ.3
+man/man3/X509_NAME_oneline.3
+man/man3/X509_NAME_print.3
+man/man3/X509_NAME_print_ex.3
+man/man3/X509_NAME_print_ex_fp.3
+man/man3/X509_free.3
+man/man3/X509_new.3
 man/man3/bio.3
 man/man3/blowfish.3
 man/man3/bn.3
+man/man3/bn_add_words.3
+man/man3/bn_check_top.3
+man/man3/bn_cmp_words.3
+man/man3/bn_div_words.3
+man/man3/bn_dump.3
+man/man3/bn_expand.3
+man/man3/bn_expand2.3
+man/man3/bn_fix_top.3
 man/man3/bn_internal.3
+man/man3/bn_mul_add_words.3
+man/man3/bn_mul_comba4.3
+man/man3/bn_mul_comba8.3
+man/man3/bn_mul_high.3
+man/man3/bn_mul_low_normal.3
+man/man3/bn_mul_low_recursive.3
+man/man3/bn_mul_normal.3
+man/man3/bn_mul_part_recursive.3
+man/man3/bn_mul_recursive.3
+man/man3/bn_mul_words.3
+man/man3/bn_print.3
+man/man3/bn_set_high.3
+man/man3/bn_set_low.3
+man/man3/bn_set_max.3
+man/man3/bn_sqr_comba4.3
+man/man3/bn_sqr_comba8.3
+man/man3/bn_sqr_normal.3
+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/buffer.3
 man/man3/crypto.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_Netscape_RSA.3
+man/man3/d2i_PKCS8PrivateKey.3
+man/man3/d2i_PKCS8PrivateKey_bio.3
+man/man3/d2i_PKCS8PrivateKey_fp.3
+man/man3/d2i_RSAPrivateKey.3
 man/man3/d2i_RSAPublicKey.3
+man/man3/d2i_RSA_PUBKEY.3
 man/man3/d2i_SSL_SESSION.3
+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_NAME.3
+man/man3/d2i_X509_REQ.3
+man/man3/d2i_X509_REQ_bio.3
+man/man3/d2i_X509_REQ_fp.3
+man/man3/d2i_X509_SIG.3
+man/man3/d2i_X509_bio.3
+man/man3/d2i_X509_fp.3
 man/man3/des.3
+man/man3/des_read_2passwords.3
+man/man3/des_read_password.3
+man/man3/des_read_pw.3
+man/man3/des_read_pw_string.3
 man/man3/dh.3
 man/man3/dsa.3
+man/man3/engine.3
 man/man3/err.3
 man/man3/evp.3
 man/man3/hmac.3
+man/man3/i2d_ASN1_OBJECT.3
+man/man3/i2d_DHparams.3
+man/man3/i2d_DSAPrivateKey.3
+man/man3/i2d_DSAPublicKey.3
+man/man3/i2d_DSA_PUBKEY.3
+man/man3/i2d_DSA_SIG.3
+man/man3/i2d_Netscape_RSA.3
+man/man3/i2d_PKCS8PrivateKey_bio.3
+man/man3/i2d_PKCS8PrivateKey_fp.3
+man/man3/i2d_PKCS8PrivateKey_nid_bio.3
+man/man3/i2d_PKCS8PrivateKey_nid_fp.3
+man/man3/i2d_RSAPrivateKey.3
+man/man3/i2d_RSAPublicKey.3
+man/man3/i2d_RSA_PUBKEY.3
+man/man3/i2d_SSL_SESSION.3
+man/man3/i2d_X509.3
+man/man3/i2d_X509_ALGOR.3
+man/man3/i2d_X509_CRL.3
+man/man3/i2d_X509_CRL_bio.3
+man/man3/i2d_X509_CRL_fp.3
+man/man3/i2d_X509_NAME.3
+man/man3/i2d_X509_REQ.3
+man/man3/i2d_X509_REQ_bio.3
+man/man3/i2d_X509_REQ_fp.3
+man/man3/i2d_X509_SIG.3
+man/man3/i2d_X509_bio.3
+man/man3/i2d_X509_fp.3
+man/man3/lh_delete.3
+man/man3/lh_doall.3
+man/man3/lh_doall_arg.3
+man/man3/lh_error.3
+man/man3/lh_free.3
+man/man3/lh_insert.3
+man/man3/lh_new.3
+man/man3/lh_node_stats.3
+man/man3/lh_node_stats_bio.3
+man/man3/lh_node_usage_stats.3
+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/lhash.3
 man/man3/md5.3
 man/man3/mdc2.3
+man/man3/pem.3
 man/man3/rand.3
 man/man3/rc4.3
 man/man3/ripemd.3
@@ -282,10 +1046,18 @@ man/man3/rsa.3
 man/man3/sha.3
 man/man3/ssl.3
 man/man3/threads.3
+man/man3/ui.3
+man/man3/ui_compat.3
 man/man5/config.5
+man/man7/Modes_of_DES.7
 man/man7/des_modes.7
 share/examples/openssl/CA.pl
 share/examples/openssl/CA.sh
+share/examples/openssl/c_hash
+share/examples/openssl/c_info
+share/examples/openssl/c_issuer
+share/examples/openssl/c_name
 share/examples/openssl/openssl.cnf
 @dirrm share/examples/openssl
+@unexec ${RMDIR} -p %D/lib/pkgconfig 2>/dev/null || ${TRUE}
 @dirrm include/openssl
diff --git a/security/openssl/PLIST.darwin b/security/openssl/PLIST.darwin
index a97ae29a00f..42a60fea837 100644
--- a/security/openssl/PLIST.darwin
+++ b/security/openssl/PLIST.darwin
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.darwin,v 1.4 2003/10/02 02:34:39 jschauma Exp $
-lib/libcrypto.300.1.dylib
-lib/libcrypto.300.dylib
+@comment $NetBSD: PLIST.darwin,v 1.5 2004/12/24 22:02:38 jlam Exp $
+lib/libcrypto.${SHLIB_VERSION}.dylib
+lib/libcrypto.${SHLIB_MAJOR}.dylib
 lib/libcrypto.dylib
-lib/libssl.300.1.dylib
-lib/libssl.300.dylib
+lib/libssl.${SHLIB_VERSION}.dylib
+lib/libssl.${SHLIB_MAJOR}.dylib
 lib/libssl.dylib
diff --git a/security/openssl/PLIST.rsaref b/security/openssl/PLIST.rsaref
deleted file mode 100644
index 9600d4661b3..00000000000
--- a/security/openssl/PLIST.rsaref
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.rsaref,v 1.1 2001/11/01 01:22:32 zuntum Exp $
-lib/libRSAglue.a
diff --git a/security/openssl/PLIST.shlib b/security/openssl/PLIST.shlib
index d4d9732c41c..a316223b8f5 100644
--- a/security/openssl/PLIST.shlib
+++ b/security/openssl/PLIST.shlib
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST.shlib,v 1.1 2004/03/26 08:33:49 jlam Exp $
+@comment $NetBSD: PLIST.shlib,v 1.2 2004/12/24 22:02:38 jlam Exp $
 lib/libcrypto.so
-lib/libcrypto.so.300
-lib/libcrypto.so.300.1
+lib/libcrypto.so.${SHLIB_VERSION}
 lib/libssl.so
-lib/libssl.so.300
-lib/libssl.so.300.1
+lib/libssl.so.${SHLIB_VERSION}
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 0b4035cd2fe..b779915f225 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2004/12/03 20:33:18 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2004/12/24 22:02:38 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	openssl
 
 .if !empty(OPENSSL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6m
+BUILDLINK_RECOMMENDED.openssl+=	openssl>=0.9.7d
 BUILDLINK_PKGSRCDIR.openssl?=	../../security/openssl
 
 # Ensure that -lcrypt comes before -lcrypto when linking so that the
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 6e7b32a41a9..f3d8ba31c2f 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.10 2004/12/18 21:32:51 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2004/12/24 22:02:38 jlam Exp $
 
-_OPENSSL_PKGSRC_PKGNAME=	openssl-0.9.6m
+_OPENSSL_PKGSRC_PKGNAME=	openssl-0.9.7e
 _OPENSSL_OPENSSLV_H=		/usr/include/openssl/opensslv.h
 
 .for _lib_ in des
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 6536fe7b467..5060a231968 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.32 2004/12/19 02:48:32 grant Exp $
+$NetBSD: distinfo,v 1.33 2004/12/24 22:02:38 jlam Exp $
 
-SHA1 (openssl-0.9.6m.tar.gz) = 52414b8867944e2c35940142d38052544dab1358
-Size (openssl-0.9.6m.tar.gz) = 2184918 bytes
-SHA1 (patch-aa) = 52276d38e21e625832be89064a5325b1ed4ceba4
-SHA1 (patch-ab) = cfbcaa52bec88987b8a63725b84adfd58b324032
-SHA1 (patch-ac) = 51079a3a9a1e489f337d66d08f10cfc956a689b1
-SHA1 (patch-ad) = ca83a28aedf78706ec4d085cd36d7f3e2ea35cd0
-SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
-SHA1 (patch-af) = 46b8d52970f27d70f35a41bbcac998379819a11d
-SHA1 (patch-aj) = e300ae91c19214faf3419e7499214a1b536aac18
+SHA1 (openssl-0.9.7e.tar.gz) = b2eb7f13cc09655ec2378c3dde3025bf7072af54
+Size (openssl-0.9.7e.tar.gz) = 3043231 bytes
+SHA1 (patch-aa) = 9296072404e29ed120dee8ffbcadffd1abc04b3d
+SHA1 (patch-ac) = d87e0f442db523f2247c3485ea1a93d7f82275c4
+SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a
+SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
+SHA1 (patch-af) = 4909cf3d5441ae51917281642b3871e1466fd2fa
 SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 0f05e1734b6..5e714f5c4f4 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2004/04/25 20:36:11 tv Exp $
+$NetBSD: patch-aa,v 1.15 2004/12/24 22:02:38 jlam Exp $
 
---- config.orig	Thu Nov 14 11:30:29 2002
+--- config.orig	2004-06-28 18:01:05.000000000 -0400
 +++ config
-@@ -139,6 +139,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -155,6 +155,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
  	echo "mips4-sgi-irix64"; exit 0
  	;;
  
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.14 2004/04/25 20:36:11 tv Exp $
      Linux:[2-9].*)
  	echo "${MACHINE}-whatever-linux2"; exit 0
  	;;
-@@ -588,8 +592,9 @@ EOF
+@@ -655,8 +659,9 @@ EOF
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
    *86*-*-netbsd) OUT="NetBSD-x86" ;;
@@ -22,6 +22,6 @@ $NetBSD: patch-aa,v 1.14 2004/04/25 20:36:11 tv Exp $
 +  sun3*-*-netbsd) OUT="NetBSD-m68k" ;;
 +  *-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;;
 +  *-*-interix3) OUT="Interix3" ;;
-   *86*-*-openbsd) OUT="OpenBSD-x86" ;;
    alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
-   pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
+   *86*-*-openbsd) OUT="OpenBSD-i386" ;;
+   m68k*-*-openbsd) OUT="OpenBSD-m68k" ;;
diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab
deleted file mode 100644
index dd4155aa85f..00000000000
--- a/security/openssl/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2003/10/02 02:34:40 jschauma Exp $
-
---- crypto/opensslv.h.orig	Tue Jul 30 05:34:28 2002
-+++ crypto/opensslv.h
-@@ -79,7 +79,7 @@
-  * should only keep the versions that are binary compatible with the current.
-  */
- #define SHLIB_VERSION_HISTORY ""
--#define SHLIB_VERSION_NUMBER "0.9.6"
-+#define SHLIB_VERSION_NUMBER "300.1"
- 
- 
- #endif /* HEADER_OPENSSLV_H */
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 6db2aecd968..529535189a1 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,192 +1,50 @@
-$NetBSD: patch-ac,v 1.17 2004/04/25 20:36:11 tv Exp $
+$NetBSD: patch-ac,v 1.18 2004/12/24 22:02:38 jlam Exp $
 
---- Configure.orig	Sun Apr 25 13:07:42 2004
+--- Configure.orig	2004-10-01 07:34:28.000000000 -0400
 +++ Configure
-@@ -129,55 +129,6 @@ my %table=(
- "gcc",		"gcc:-O3::(unknown)::BN_LLONG:::",
- "cc",		"cc:-O::(unknown):::::",
- 
--#### Solaris x86 setups
--# -DNO_INLINE_ASM switches off inline assembler. We have to do it
--# here because whenever GNU C instantiates an assembler template it
--# surrounds it with #APP #NO_APP comment pair which (at least Solaris
--# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
--# error message.
--"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--
--#### 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::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--
--#### 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::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
--# but keep the assembler modules.
--"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--####
--"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--
--#### SPARC Solaris with Sun C setups
--# DO NOT use /xO[34] on sparc with SC3.0.  It is broken, and will not pass the tests
--"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--# SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
--# SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
--# SC5.0 note: Compiler common patch 107357-01 or later is required!
--"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
--####
--"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--
--#### SPARC Linux setups
--"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
--# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
--# assisted with debugging of following two configs.
--"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--# it's a real mess with -mcpu=ultrasparc option under Linux, but
--# -Wa,-Av8plus should do the trick no matter what.
--"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--# !!!Folowing can't be even tested yet!!!
--#    We have to wait till 64-bit glibc for SPARC is operational!!!
--#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
--
- # Sunos configs, assuming sparc for the gcc one.
- ##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown)::DES_UNROLL:::",
- "sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:::",
-@@ -275,9 +226,6 @@ my %table=(
- #### HP MPE/iX http://jazz.external.hp.com/src/openssl/
- "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
- 
--#### PARISC Linux setups
--"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
--
- # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion
- # from the older DEC C Compiler to the newer compiler.  It's now the
- # same as the preferred entry, alpha-cc.  If you are still using the
-@@ -336,20 +284,6 @@ my %table=(
- 
- # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
- # bn86-elf.o file file since it is hand tweaked assembler.
--"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
--"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
--"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
--"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::",
--"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::",
--"linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "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}",
-@@ -507,6 +441,91 @@ my %table=(
- ##### Compaq Non-Stop Kernel (Tandem)
- "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown)::THIRTY_TWO_BIT:::",
- 
-+ ##### NetBSD
-+ "NetBSD-alpha", "gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-arm", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-arm32", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-m68000", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-m68k",	"gcc:-DTERMIOS -O2 -m68020-40 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-mipseb", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-mipsel", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-ns32k", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-powerpc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-sparc",	"gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-sparc64", "gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:SIXTY_FOUR_BIT_LONG DES_INT DES_RISC1::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+ "NetBSD-x86",	"gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+"Interix3","gcc:-DTERMIOS -O2 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,\$\$((\$\$RANDOM %64/2*1048576+1577058304)):.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+##### Solaris (pkgsrc)
-+
-+#### Solaris x86 setups
-+# -DNO_INLINE_ASM switches off inline assembler. We have to do it
-+# here because whenever GNU C instantiates an assembler template it
-+# surrounds it with #APP #NO_APP comment pair which (at least Solaris
-+# 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
-+# error message.
-+"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+#### Solaris x86 with Sun C setups
-+"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+#### SPARC Solaris with GNU C setups
-+"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
-+# but keep the assembler modules.
-+"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+####
-+"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+#### SPARC Solaris with Sun C setups
-+# DO NOT use /xO[34] on sparc with SC3.0.  It is broken, and will not pass the tests
-+"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+# SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
-+# SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
-+# SC5.0 note: Compiler common patch 107357-01 or later is required!
-+"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
-+####
-+"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+##### Linux (pkgsrc)
-+
-+#### SPARC Linux setups
-+"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
-+# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
-+# assisted with debugging of following two configs.
-+"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+# it's a real mess with -mcpu=ultrasparc option under Linux, but
-+# -Wa,-Av8plus should do the trick no matter what.
-+"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+# !!!Folowing can't be even tested yet!!!
-+#    We have to wait till 64-bit glibc for SPARC is operational!!!
-+#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
-+
-+#### PARISC Linux setups
-+"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
-+
-+"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall:-Wl,-R\$(INSTALLTOP)/lib:-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall:-Wl,-R\$(INSTALLTOP)/lib:-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
-+"linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
-+"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG:::",
-+"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown):-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG:::",
-+"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib:BN_LLONG::",
-+"linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR),\$(SHLIB_MINOR)",
-+"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-Wl,-R\$(INSTALLTOP)/lib -ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- );
- 
- my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
-@@ -680,7 +699,7 @@ PROCESS_ARGS:
- 			}
- 		elsif (/^[-+]/)
- 			{
--			if (/^-[lL](.*)$/)
-+			if (/^-[lL](.*)$/ or /^-Wl,(.*)$/)
+@@ -400,9 +400,22 @@ my %table=(
+ "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
++"NetBSD-alpha", "gcc:-DTERMIOS -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-arm", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-arm32", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-m68000", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-m68k", "gcc:-DTERMIOS -O2 -m68020-40 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-mipseb", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-mipsel", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-ns32k", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-powerpc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-sparc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-sparc64", "gcc:-DTERMIOS -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-x86", "gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-x86_64", "gcc:-DTERMIOS -O2 -DMD32_REG_T=int::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"Interix3","gcc:-DTERMIOS -O2 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,\$\$((\$\$RANDOM %64/2*1048576+1577058304)):.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -832,6 +845,10 @@ PROCESS_ARGS:
  				{
  				$libs.=$_." ";
  				}
++			elsif (/^-Wl,(.*)$/)
++				{
++				$libs.=$_." ";
++				}
+ 			elsif (/^-[^-]/ or /^\+/)
+ 				{
+ 				$flags.=$_." ";
+@@ -1297,7 +1314,7 @@ while (<IN>)
+ 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
+ 		{
+ 		my $sotmp = $1;
+-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
++		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
+ 		}
+ 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
+ 		{
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad
index 6f3f30f2935..a7ce5c6c5e6 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.12 2004/12/17 23:08:36 wiz Exp $
+$NetBSD: patch-ad,v 1.13 2004/12/24 22:02:38 jlam Exp $
 
---- apps/Makefile.ssl.orig	2003-08-14 08:30:31.000000000 +0200
-+++ apps/Makefile.ssl
-@@ -31,7 +31,7 @@ LIBSSL=-L.. -lssl
+--- apps/Makefile.orig	2004-08-10 05:09:07.000000000 -0400
++++ apps/Makefile
+@@ -10,6 +10,7 @@ CFLAG=		-g -static
+ INSTALL_PREFIX=
+ INSTALLTOP=	/usr/local/ssl
+ OPENSSLDIR=	/usr/local/ssl
++EXAMPLEDIR=	$(INSTALLTOP)/share/examples/openssl
+ MAKEDEPPROG=	makedepend
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
+ MAKEFILE=	Makefile
+@@ -36,7 +37,7 @@ LIBSSL=-L.. -lssl
  
  PROGRAM= openssl
  
@@ -11,29 +19,23 @@ $NetBSD: patch-ad,v 1.12 2004/12/17 23:08:36 wiz Exp $
  
  EXE= $(PROGRAM)$(EXE_EXT)
  
-@@ -100,11 +100,11 @@ install:
+@@ -106,13 +107,13 @@ install:
  	@for i in $(SCRIPTS); \
  	do  \
  	(echo installing $$i; \
--	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
--	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
--	 done
--	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
--	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
-+	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/$$i; \
-+	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/$$i ); \
-+	 done;
-+	@cp openssl.cnf $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/; \
-+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/openssl.cnf
+-	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	 mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
++	 cp $$i $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i.new; \
++	 chmod 755 $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i.new; \
++	 mv -f $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i.new $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i ); \
+ 	 done
+-	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+-	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+-	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
++	@cp openssl.cnf $(INSTALL_PREFIX)$(EXAMPLEDIR)/openssl.cnf.new; \
++	chmod 644 $(INSTALL_PREFIX)$(EXAMPLEDIR)/openssl.cnf.new; \
++	mv -f  $(INSTALL_PREFIX)$(EXAMPLEDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(EXAMPLEDIR)/openssl.cnf
  
  tags:
  	ctags $(SRC)
-@@ -138,7 +138,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).
- 	$(RM) $(PROGRAM)
- 	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
- 	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
--	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
-+	-(cd ..; LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
- 
- progs.h: progs.pl
- 	$(PERL) progs.pl $(E_EXE) >progs.h
diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch-ae
index 808d4a29d36..80ffd555a89 100644
--- a/security/openssl/patches/patch-ae
+++ b/security/openssl/patches/patch-ae
@@ -1,15 +1,25 @@
-$NetBSD: patch-ae,v 1.6 2002/08/25 19:23:19 jlam Exp $
+$NetBSD: patch-ae,v 1.7 2004/12/24 22:02:38 jlam Exp $
 
---- tools/Makefile.ssl.orig	Thu Apr 29 16:52:08 1999
-+++ tools/Makefile.ssl
-@@ -31,8 +31,8 @@
+--- tools/Makefile.orig	2004-05-11 08:46:17.000000000 -0400
++++ tools/Makefile
+@@ -10,6 +10,7 @@ CFLAG=-g
+ INSTALL_PREFIX=
+ OPENSSLDIR=     /usr/local/ssl
+ INSTALLTOP=/usr/local/ssl
++EXAMPLEDIR=	$(INSTALLTOP)/share/examples/openssl
+ MAKEDEPPROG=	makedepend
+ MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
+ MAKEFILE=	Makefile
+@@ -31,9 +32,9 @@ install:
  	done;
  	@for i in $(MISC_APPS) ; \
  	do  \
--	(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
--	chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
-+	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-+	chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
+-	(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
++	(cp $$i $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i.new; \
++	chmod 755 $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i.new; \
++	mv -f $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i.new $(INSTALL_PREFIX)$(EXAMPLEDIR)/$$i ); \
  	done;
  
  files:
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index 3ff5d82a628..15b1b48b5cd 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,44 +1,35 @@
-$NetBSD: patch-af,v 1.12 2004/12/19 02:48:32 grant Exp $
+$NetBSD: patch-af,v 1.13 2004/12/24 22:02:38 jlam Exp $
 
---- Makefile.org.orig	2003-07-04 07:43:50.000000000 +1000
+--- Makefile.org.orig	2004-09-28 16:52:14.000000000 -0400
 +++ Makefile.org
-@@ -169,7 +169,7 @@ SDIRS=  \
- MAKEFILE= Makefile.ssl
- MAKE=     make -f Makefile.ssl
+@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
+ 
+ # Do not edit this manually. Use Configure --openssldir=DIR do change this!
+ OPENSSLDIR=/usr/local/ssl
++EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
+ 
+ # NO_IDEA - Define to build without the IDEA algorithm
+ # NO_RC4  - Define to build without the RC4 algorithm
+@@ -194,7 +195,7 @@ TESTS = alltests
+ 
+ MAKEFILE= Makefile
  
 -MANDIR=$(OPENSSLDIR)/man
 +MANDIR=$(INSTALLTOP)/man
  MAN1=1
  MAN3=3
- SHELL=/bin/sh
-@@ -262,8 +262,7 @@ do_gnu-shared:
- 	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
+ MANSUFFIX=
+@@ -306,8 +307,7 @@ do_gnu-shared:
+ 	fi; \
  	( set -x; ${CC} ${SHARED_LDFLAGS} \
  		-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 -		-Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 -		-Wl,-Bsymbolic \
-+		-Wl,-h,lib$$i.so.${SHLIB_MAJOR} \
++		-Wl,-h,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
  		-Wl,--whole-archive lib$$i.a \
  		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
- 	libs="$$libs -l$$i"; \
-@@ -277,8 +276,14 @@ DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc
- # For Darwin AKA Mac OS/X (dyld)
- do_darwin-shared: 
- 	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
--	( set -x ; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
--		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
-+	( set -x ; \
-+		  find . -name "*.o" -print > allobjs ; \
-+		  OBJS= ; export OBJS ; \
-+		  for obj in `ar t lib$$i.a` ; do \
-+		    OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
-+		  done ; \
-+		${CC} -dynamiclib -o lib$$i${SHLIB_EXT} \
-+		$$libs $${OBJS} -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
- 		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
- 		-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
- 	libs="$$libs -l`basename $$i${SHLIB_EXT} .dylib`"; \
-@@ -449,7 +454,7 @@ do_hpux64-shared:
+ 	libs="-l$$i $$libs"; \
+@@ -548,7 +548,7 @@ do_hpux64-shared:
  #  HP/UX-64bit: +forceload
  #  AIX:		-bnogc
  # SHAREDFLAGS would be:
@@ -47,22 +38,22 @@ $NetBSD: patch-af,v 1.12 2004/12/19 02:48:32 grant Exp $
  #  Tru64 Unix:  -shared \
  #		-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
  #  Solaris:     -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-@@ -636,14 +641,14 @@ dist:   
+@@ -790,16 +790,14 @@ dist:   
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
  
--install: all install_docs
-+install: install_docs
+-install: all install_docs install_sw
++install: install_docs install_sw
+ 
+ install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 -		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-+		$(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl \
-+		$(INSTALL_PREFIX)$(OPENSSLDIR) \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
--		$(INSTALL_PREFIX)$(OPENSSLDIR)/private \
--		$(INSTALL_PREFIX)$(OPENSSLDIR)/lib
-+		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
+-		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+-		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++		$(INSTALL_PREFIX)$(EXAMPLEDIR)
  	@for i in $(EXHEADER) ;\
  	do \
  	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
diff --git a/security/openssl/patches/patch-aj b/security/openssl/patches/patch-aj
deleted file mode 100644
index 693693f7026..00000000000
--- a/security/openssl/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.8 2003/10/02 02:34:40 jschauma Exp $
-
---- crypto/rsa/rsa_lib.c.orig	2003-04-16 02:25:25.000000000 -0400
-+++ crypto/rsa/rsa_lib.c	2003-10-01 21:54:25.000000000 -0400
-@@ -74,6 +74,10 @@
- 	{
- 	RSA *r=RSA_new_method(NULL);
- 
-+#ifndef OPENSSL_NO_FORCE_RSA_BLINDING
-+	r->flags|=RSA_FLAG_BLINDING;
-+#endif
-+
- 	return r;
- 	}
-