Update to v 0.8.1. New algorithms (Blowfish &c) added. SSLv3 added.

Thanks to: Richard Seaman <Dick@tar.com>

10 files changed, 544 insertions, 106 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index d2f8296c815f..4c169e9ee2d5 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -1,14 +1,11 @@
 # New ports collection makefile for:	Eric Young's SSL/Crypto Library
-# Version required:	0.6.6
-# Date created:		13 January 1997
-# Whom:			markm
+# Version required:	0.8.1
+# Date created:		15 Aug 1997
+# Whom:			markm@freebsd.org
 #
-# $Id: Makefile,v 1.9 1996/12/11 20:54:44 markm Exp $
-#
-# NOTE!!! To use this port, you must have FreeBSD 2.2 or later, and you
-#         must have the secure/ distribution loaded.
+# $Id$
 
-DISTNAME=		SSLeay-0.6.6
+DISTNAME=		SSLeay-0.8.1
 CATEGORIES=		devel security
 MASTER_SITES=		ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/
 
@@ -17,8 +14,23 @@ MAINTAINER=		markm@FreeBSD.ORG
 RESTRICTED=		"Cryptography"
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	util/FreeBSD.sh
-MAKEFILE=		Makefile.FreeBSD
 
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
+pre-fetch:
+	@echo
+	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
+	@echo or to NO, if you aren\'t USA resident to build this package.
+	@echo You must also have installed RSAREF if you are USA resident.
+	@false
+.elif defined(USA_RESIDENT)
+.if ${USA_RESIDENT} == YES
+LIB_DEPENDS             rsaref:${PORTSDIR}/security/rsaref
+
+post-configure:
+	${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
+	(${PATCH} <${FILESDIR}/Makefile.patch)
+.endif
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo
index 5fb86bf159ce..df237c30d125 100644
--- a/security/openssl-beta/distinfo
+++ b/security/openssl-beta/distinfo
@@ -1 +1 @@
-MD5 (SSLeay-0.6.6.tar.gz) = e98396ff1a21e26402c3208df049b953
+MD5 (SSLeay-0.8.1.tar.gz) = 10092f272305e4c9162c906904550100
diff --git a/security/openssl-beta/pkg-comment b/security/openssl-beta/pkg-comment
index 6e2d7f75b37d..bf6eaba1f945 100644
--- a/security/openssl-beta/pkg-comment
+++ b/security/openssl-beta/pkg-comment
@@ -1 +1 @@
-SSL and crypto library (Excluding DES, MD2 and MD5)
+SSL and crypto library
diff --git a/security/openssl-beta/pkg-descr b/security/openssl-beta/pkg-descr
index d9641e291bc9..ec90a11323c9 100644
--- a/security/openssl-beta/pkg-descr
+++ b/security/openssl-beta/pkg-descr
@@ -1,24 +1,88 @@
-This is Eric Young's SSL and Crypto library. It includes
+The package includes
 
 libssl.a:
-	An implementation of Netscapes SSL v 2 protocol.  This library
-	implements the SSL protocol.
+	My implementation of SSLv2, SSLv3 and the required code to support
+	both SSLv2 and SSLv3 in the one server.
 
 libcrypto.a:
 	General encryption and X509 stuff needed by SSL but not
 	actually logically part of it.  It includes routines for the following:
+
+  Ciphers
+	libdes - My libdes DES encryption package which has been floating
+		around the net for a few years.  It includes 15
+		'modes/variations' of DES (1, 2 and 3 key versions of ecb,
+		cbc, cfb and ofb; pcbc and a more general form of cfb and ofb)
+		including desx in cbc mode,
+		a fast crypt(3), and routines to read passwords from the
+		keyboard.
 	RC4 encryption,
-	IDEA encryption - 4 different modes, ecb, cbc, cfb and ofb.
+	RC2 encryption 		- 4 different modes, ecb, cbc, cfb and ofb.
+	Blowfish encryption	- 4 different modes, ecb, cbc, cfb and ofb.
+	IDEA encryption		- 4 different modes, ecb, cbc, cfb and ofb.
+
+  Digests
+	MD5 and MD2 message digest algorithms, fast implementations,
 	SHA (SHA-0) and SHA-1 message digest algorithms,
-	RSA encryption/decryption/key generation.  There is no limit
+	MDC2 message digest.  A DES based hash that is polular on smart cards.
+
+  Public Key
+	RSA encryption/decryption/generation.  There is no limit
 		on the number of bits.
+	DSA encryption/decryption/generation.   There is no limit on the
+		number of bits.
 	Diffie-Hellman key-exchange/key generation.  There is no limit
 		on the number of bits.
-	X509 encoding/decoding into/from binary ASN1 and a
-		PEM based ascii-binary encoding which supports encryption
-		with a private key.
-
-As this is a FreeBSD port, it has been tailored to FreeBSD.  It
-uses the DES, MD2 and MD5 from FreeBSD 2.2+. Earlier versions of
-freebsd have a DES library that is missing bits, and SSLeay will
-not compile properly. The answer is to get the latest secure/ dist.
+
+  X509v3 certificates
+	X509 encoding/decoding into/from binary ASN1 and a PEM
+		based ascii-binary encoding which supports encryption with
+		a private key.
+	Program to generate RSA and DSA certificate requests and to
+		generate RSA and DSA certificates.
+
+  Systems
+  	The normal digital envelope routines and base64 encoding.
+	Higher level access to ciphers and digests by name.  New ciphers can be
+		loaded at run time.
+	The BIO io system which is a simple non-blocking IO abstraction.
+		Current methods supported are file descriptors, sockets,
+		socket accept, socket connect, memory buffer, buffering,
+		SSL client/server, file pointer, encryption, digest,
+		non-blocking testing and null.
+  Data structures
+  	A dynamically growing hashing system
+	A simple stack.
+	A Configuration loader that uses a format similar to MS .ini files.
+
+Programs in this package include
+	enc	- a general encryption program that can encrypt/decrypt using
+		one of 17 different cipher/mode combinations.  The
+		input/output can also be converted to/from base64
+		ascii encoding.
+	dgst	- a generate message digesting program that will generate
+		message digests for any of md2, md5, sha (sha-0 or sha-1)
+		or mdc2.
+	asn1parse - parse and display the structure of an asn1 encoded
+		binary file.
+	rsa	- Manipulate RSA private keys.
+	dsa	- Manipulate DSA private keys.
+	dh	- Manipulate Diffie-Hellman parameter files.
+	dsaparam- Manipulate and generate DSA parameter files.
+	crl	- Manipulate certificate revocation lists.
+	crt2pkcs7- Generate a pkcs7 object containing a crl and a certificate.
+	x509	- Manipulate x509 certificates, self-sign certificates.
+	req	- Manipulate PKCS#10 certificate requests and also
+		  generate certificate requests.
+	genrsa  - Generates an arbitrary sized RSA private key.
+	gendh	- Generates a set of Diffie-Hellman parameters, the prime
+		  will be a strong prime.
+	ca	- Create certificates from PKCS#10 certificate requests.
+		  This program also maintains a database of certificates
+		  issued.
+	verify	- Check x509 certificate signatures.
+	speed	- Benchmark SSLeay's ciphers.
+	s_server- A test SSL server.
+	s_client- A test SSL client.
+	s_time	- Benchmark SSL performance of SSL server programs.
+	errstr	- Convert from SSLeay hex error codes to a readable form.
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 917a36feb6d1..9847ecb0cb9a 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -1,49 +1,188 @@
+bin/CA.sh
+bin/c_hash
+bin/c_info
+bin/c_issuer
+bin/c_name
+bin/c_rehash
+bin/der_chop
 bin/ssleay
-etc/ssleay.cnf
+@exec ln -sf %D/%F %B/asn1parse
+@exec ln -sf %D/%F %B/base64
+@exec ln -sf %D/%F %B/bf
+@exec ln -sf %D/%F %B/bf-cbc
+@exec ln -sf %D/%F %B/bf-cfb
+@exec ln -sf %D/%F %B/bf-ecb
+@exec ln -sf %D/%F %B/bf-ofb
+@exec ln -sf %D/%F %B/ca
+@exec ln -sf %D/%F %B/ciphers
+@exec ln -sf %D/%F %B/crl
+@exec ln -sf %D/%F %B/crl2pkcs7
+@exec ln -sf %D/%F %B/des
+@exec ln -sf %D/%F %B/des-cbc
+@exec ln -sf %D/%F %B/des-cfb
+@exec ln -sf %D/%F %B/des-ecb
+@exec ln -sf %D/%F %B/des-ede
+@exec ln -sf %D/%F %B/des-ede-cbc
+@exec ln -sf %D/%F %B/des-ede-cfb
+@exec ln -sf %D/%F %B/des-ede-ofb
+@exec ln -sf %D/%F %B/des-ede3
+@exec ln -sf %D/%F %B/des-ede3-cbc
+@exec ln -sf %D/%F %B/des-ede3-cfb
+@exec ln -sf %D/%F %B/des-ede3-ofb
+@exec ln -sf %D/%F %B/des-ofb
+@exec ln -sf %D/%F %B/des3
+@exec ln -sf %D/%F %B/desx
+@exec ln -sf %D/%F %B/dgst
+@exec ln -sf %D/%F %B/dh
+@exec ln -sf %D/%F %B/dsa
+@exec ln -sf %D/%F %B/dsaparam
+@exec ln -sf %D/%F %B/enc
+@exec ln -sf %D/%F %B/errstr
+@exec ln -sf %D/%F %B/gendh
+@exec ln -sf %D/%F %B/gendsa
+@exec ln -sf %D/%F %B/genrsa
+@exec ln -sf %D/%F %B/idea
+@exec ln -sf %D/%F %B/idea-cbc
+@exec ln -sf %D/%F %B/idea-cfb
+@exec ln -sf %D/%F %B/idea-ecb
+@exec ln -sf %D/%F %B/idea-ofb
+@exec ln -sf %D/%F %B/md2
+@exec ln -sf %D/%F %B/md5
+@exec ln -sf %D/%F %B/mdc2
+@exec ln -sf %D/%F %B/pkcs7
+@exec ln -sf %D/%F %B/rc2
+@exec ln -sf %D/%F %B/rc2-cbc
+@exec ln -sf %D/%F %B/rc2-cfb
+@exec ln -sf %D/%F %B/rc2-ecb
+@exec ln -sf %D/%F %B/rc2-ofb
+@exec ln -sf %D/%F %B/rc4
+@exec ln -sf %D/%F %B/req
+@exec ln -sf %D/%F %B/rsa
+@exec ln -sf %D/%F %B/s_client
+@exec ln -sf %D/%F %B/s_server
+@exec ln -sf %D/%F %B/s_time
+@exec ln -sf %D/%F %B/sess_id
+@exec ln -sf %D/%F %B/sha
+@exec ln -sf %D/%F %B/sha1
+@exec ln -sf %D/%F %B/speed
+@exec ln -sf %D/%F %B/verify
+@exec ln -sf %D/%F %B/version
+@exec ln -sf %D/%F %B/x509
+@unexec rm %B/asn1parse
+@unexec rm %B/base64
+@unexec rm %B/bf
+@unexec rm %B/bf-cbc
+@unexec rm %B/bf-cfb
+@unexec rm %B/bf-ecb
+@unexec rm %B/bf-ofb
+@unexec rm %B/ca
+@unexec rm %B/ciphers
+@unexec rm %B/crl
+@unexec rm %B/crl2pkcs7
+@unexec rm %B/des
+@unexec rm %B/des-cbc
+@unexec rm %B/des-cfb
+@unexec rm %B/des-ecb
+@unexec rm %B/des-ede
+@unexec rm %B/des-ede-cbc
+@unexec rm %B/des-ede-cfb
+@unexec rm %B/des-ede-ofb
+@unexec rm %B/des-ede3
+@unexec rm %B/des-ede3-cbc
+@unexec rm %B/des-ede3-cfb
+@unexec rm %B/des-ede3-ofb
+@unexec rm %B/des-ofb
+@unexec rm %B/des3
+@unexec rm %B/desx
+@unexec rm %B/dgst
+@unexec rm %B/dh
+@unexec rm %B/dsa
+@unexec rm %B/dsaparam
+@unexec rm %B/enc
+@unexec rm %B/errstr
+@unexec rm %B/gendh
+@unexec rm %B/gendsa
+@unexec rm %B/genrsa
+@unexec rm %B/idea
+@unexec rm %B/idea-cbc
+@unexec rm %B/idea-cfb
+@unexec rm %B/idea-ecb
+@unexec rm %B/idea-ofb
+@unexec rm %B/md2
+@unexec rm %B/md5
+@unexec rm %B/mdc2
+@unexec rm %B/pkcs7
+@unexec rm %B/rc2
+@unexec rm %B/rc2-cbc
+@unexec rm %B/rc2-cfb
+@unexec rm %B/rc2-ecb
+@unexec rm %B/rc2-ofb
+@unexec rm %B/rc4
+@unexec rm %B/req
+@unexec rm %B/rsa
+@unexec rm %B/s_client
+@unexec rm %B/s_server
+@unexec rm %B/s_time
+@unexec rm %B/sess_id
+@unexec rm %B/sha
+@unexec rm %B/sha1
+@unexec rm %B/speed
+@unexec rm %B/verify
+@unexec rm %B/version
+@unexec rm %B/x509
 include/asn1.h
-include/txt_db.h
-include/stack.h
-include/ssl.h
-include/sha.h
-include/rsa.h
-include/rc4.h
-include/rc2.h
-include/rand.h
-include/pkcs7.h
-include/pem.h
-include/objects.h
-include/md5.h
-include/md2.h
-include/lhash.h
-include/idea.h
-include/err.h
-include/envelope.h
-include/dsa.h
-include/dh.h
-include/crypto.h
-include/cryptall.h
-include/conf.h
-include/buffer.h
-include/bn.h
-include/blowfish.h
 include/asn1_mac.h
+include/bio.h
+include/blowfish.h
+include/bn.h
+include/buffer.h
+include/conf.h
+include/cryptall.h
+include/crypto.h
+include/des.h
+include/dh.h
+include/dsa.h
+include/err.h
+include/evp.h
+include/idea.h
+include/lhash.h
+include/md2.h
+include/md5.h
+include/mdc2.h
+include/objects.h
+include/pem.h
+include/pkcs7.h
+include/rand.h
+include/rc2.h
+include/rc4.h
+include/rsa.h
+include/sha.h
+include/ssl.h
+include/ssl2.h
+include/ssl23.h
+include/ssl3.h
+include/stack.h
+include/txt_db.h
 include/x509.h
-lib/libssl.a
-@exec ranlib %D/%F
+include/x509_vfy.h
 lib/libcrypto.a
 @exec ranlib %D/%F
-lib/libRSAglue.a
+lib/libssl.a
 @exec ranlib %D/%F
+lib/ssleay.cnf
+share/doc/SSLeay/API.doc
 share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
 share/doc/SSLeay/asn1.doc
 share/doc/SSLeay/bio.doc
+share/doc/SSLeay/blowfish.doc
 share/doc/SSLeay/bn.doc
 share/doc/SSLeay/ca.1
 share/doc/SSLeay/callback.doc
 share/doc/SSLeay/cipher.doc
 share/doc/SSLeay/cipher.m
 share/doc/SSLeay/conf.doc
+share/doc/SSLeay/danger
 share/doc/SSLeay/des.doc
 share/doc/SSLeay/digest.doc
 share/doc/SSLeay/encode.doc
@@ -55,6 +194,7 @@ share/doc/SSLeay/lhash.doc
 share/doc/SSLeay/md2.doc
 share/doc/SSLeay/md5.doc
 share/doc/SSLeay/memory.doc
+share/doc/SSLeay/ms3-ca.doc
 share/doc/SSLeay/ns-ca.doc
 share/doc/SSLeay/obj.doc
 share/doc/SSLeay/rand.doc
@@ -69,6 +209,7 @@ share/doc/SSLeay/s_mult.doc
 share/doc/SSLeay/session.doc
 share/doc/SSLeay/sha.doc
 share/doc/SSLeay/speed.doc
+share/doc/SSLeay/ssl-ciph.doc
 share/doc/SSLeay/ssl.doc
 share/doc/SSLeay/ssl_ctx.doc
 share/doc/SSLeay/ssleay.doc
@@ -76,4 +217,6 @@ share/doc/SSLeay/ssluse.doc
 share/doc/SSLeay/stack.doc
 share/doc/SSLeay/threads.doc
 share/doc/SSLeay/txt_db.doc
+share/doc/SSLeay/verify
 share/doc/SSLeay/why.doc
+@unexec rm -rf share/doc/SSLeay
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index d2f8296c815f..4c169e9ee2d5 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,14 +1,11 @@
 # New ports collection makefile for:	Eric Young's SSL/Crypto Library
-# Version required:	0.6.6
-# Date created:		13 January 1997
-# Whom:			markm
+# Version required:	0.8.1
+# Date created:		15 Aug 1997
+# Whom:			markm@freebsd.org
 #
-# $Id: Makefile,v 1.9 1996/12/11 20:54:44 markm Exp $
-#
-# NOTE!!! To use this port, you must have FreeBSD 2.2 or later, and you
-#         must have the secure/ distribution loaded.
+# $Id$
 
-DISTNAME=		SSLeay-0.6.6
+DISTNAME=		SSLeay-0.8.1
 CATEGORIES=		devel security
 MASTER_SITES=		ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/
 
@@ -17,8 +14,23 @@ MAINTAINER=		markm@FreeBSD.ORG
 RESTRICTED=		"Cryptography"
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	util/FreeBSD.sh
-MAKEFILE=		Makefile.FreeBSD
 
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
+pre-fetch:
+	@echo
+	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
+	@echo or to NO, if you aren\'t USA resident to build this package.
+	@echo You must also have installed RSAREF if you are USA resident.
+	@false
+.elif defined(USA_RESIDENT)
+.if ${USA_RESIDENT} == YES
+LIB_DEPENDS             rsaref:${PORTSDIR}/security/rsaref
+
+post-configure:
+	${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
+	(${PATCH} <${FILESDIR}/Makefile.patch)
+.endif
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 5fb86bf159ce..df237c30d125 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1 +1 @@
-MD5 (SSLeay-0.6.6.tar.gz) = e98396ff1a21e26402c3208df049b953
+MD5 (SSLeay-0.8.1.tar.gz) = 10092f272305e4c9162c906904550100
diff --git a/security/openssl/pkg-comment b/security/openssl/pkg-comment
index 6e2d7f75b37d..bf6eaba1f945 100644
--- a/security/openssl/pkg-comment
+++ b/security/openssl/pkg-comment
@@ -1 +1 @@
-SSL and crypto library (Excluding DES, MD2 and MD5)
+SSL and crypto library
diff --git a/security/openssl/pkg-descr b/security/openssl/pkg-descr
index d9641e291bc9..ec90a11323c9 100644
--- a/security/openssl/pkg-descr
+++ b/security/openssl/pkg-descr
@@ -1,24 +1,88 @@
-This is Eric Young's SSL and Crypto library. It includes
+The package includes
 
 libssl.a:
-	An implementation of Netscapes SSL v 2 protocol.  This library
-	implements the SSL protocol.
+	My implementation of SSLv2, SSLv3 and the required code to support
+	both SSLv2 and SSLv3 in the one server.
 
 libcrypto.a:
 	General encryption and X509 stuff needed by SSL but not
 	actually logically part of it.  It includes routines for the following:
+
+  Ciphers
+	libdes - My libdes DES encryption package which has been floating
+		around the net for a few years.  It includes 15
+		'modes/variations' of DES (1, 2 and 3 key versions of ecb,
+		cbc, cfb and ofb; pcbc and a more general form of cfb and ofb)
+		including desx in cbc mode,
+		a fast crypt(3), and routines to read passwords from the
+		keyboard.
 	RC4 encryption,
-	IDEA encryption - 4 different modes, ecb, cbc, cfb and ofb.
+	RC2 encryption 		- 4 different modes, ecb, cbc, cfb and ofb.
+	Blowfish encryption	- 4 different modes, ecb, cbc, cfb and ofb.
+	IDEA encryption		- 4 different modes, ecb, cbc, cfb and ofb.
+
+  Digests
+	MD5 and MD2 message digest algorithms, fast implementations,
 	SHA (SHA-0) and SHA-1 message digest algorithms,
-	RSA encryption/decryption/key generation.  There is no limit
+	MDC2 message digest.  A DES based hash that is polular on smart cards.
+
+  Public Key
+	RSA encryption/decryption/generation.  There is no limit
 		on the number of bits.
+	DSA encryption/decryption/generation.   There is no limit on the
+		number of bits.
 	Diffie-Hellman key-exchange/key generation.  There is no limit
 		on the number of bits.
-	X509 encoding/decoding into/from binary ASN1 and a
-		PEM based ascii-binary encoding which supports encryption
-		with a private key.
-
-As this is a FreeBSD port, it has been tailored to FreeBSD.  It
-uses the DES, MD2 and MD5 from FreeBSD 2.2+. Earlier versions of
-freebsd have a DES library that is missing bits, and SSLeay will
-not compile properly. The answer is to get the latest secure/ dist.
+
+  X509v3 certificates
+	X509 encoding/decoding into/from binary ASN1 and a PEM
+		based ascii-binary encoding which supports encryption with
+		a private key.
+	Program to generate RSA and DSA certificate requests and to
+		generate RSA and DSA certificates.
+
+  Systems
+  	The normal digital envelope routines and base64 encoding.
+	Higher level access to ciphers and digests by name.  New ciphers can be
+		loaded at run time.
+	The BIO io system which is a simple non-blocking IO abstraction.
+		Current methods supported are file descriptors, sockets,
+		socket accept, socket connect, memory buffer, buffering,
+		SSL client/server, file pointer, encryption, digest,
+		non-blocking testing and null.
+  Data structures
+  	A dynamically growing hashing system
+	A simple stack.
+	A Configuration loader that uses a format similar to MS .ini files.
+
+Programs in this package include
+	enc	- a general encryption program that can encrypt/decrypt using
+		one of 17 different cipher/mode combinations.  The
+		input/output can also be converted to/from base64
+		ascii encoding.
+	dgst	- a generate message digesting program that will generate
+		message digests for any of md2, md5, sha (sha-0 or sha-1)
+		or mdc2.
+	asn1parse - parse and display the structure of an asn1 encoded
+		binary file.
+	rsa	- Manipulate RSA private keys.
+	dsa	- Manipulate DSA private keys.
+	dh	- Manipulate Diffie-Hellman parameter files.
+	dsaparam- Manipulate and generate DSA parameter files.
+	crl	- Manipulate certificate revocation lists.
+	crt2pkcs7- Generate a pkcs7 object containing a crl and a certificate.
+	x509	- Manipulate x509 certificates, self-sign certificates.
+	req	- Manipulate PKCS#10 certificate requests and also
+		  generate certificate requests.
+	genrsa  - Generates an arbitrary sized RSA private key.
+	gendh	- Generates a set of Diffie-Hellman parameters, the prime
+		  will be a strong prime.
+	ca	- Create certificates from PKCS#10 certificate requests.
+		  This program also maintains a database of certificates
+		  issued.
+	verify	- Check x509 certificate signatures.
+	speed	- Benchmark SSLeay's ciphers.
+	s_server- A test SSL server.
+	s_client- A test SSL client.
+	s_time	- Benchmark SSL performance of SSL server programs.
+	errstr	- Convert from SSLeay hex error codes to a readable form.
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 917a36feb6d1..9847ecb0cb9a 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -1,49 +1,188 @@
+bin/CA.sh
+bin/c_hash
+bin/c_info
+bin/c_issuer
+bin/c_name
+bin/c_rehash
+bin/der_chop
 bin/ssleay
-etc/ssleay.cnf
+@exec ln -sf %D/%F %B/asn1parse
+@exec ln -sf %D/%F %B/base64
+@exec ln -sf %D/%F %B/bf
+@exec ln -sf %D/%F %B/bf-cbc
+@exec ln -sf %D/%F %B/bf-cfb
+@exec ln -sf %D/%F %B/bf-ecb
+@exec ln -sf %D/%F %B/bf-ofb
+@exec ln -sf %D/%F %B/ca
+@exec ln -sf %D/%F %B/ciphers
+@exec ln -sf %D/%F %B/crl
+@exec ln -sf %D/%F %B/crl2pkcs7
+@exec ln -sf %D/%F %B/des
+@exec ln -sf %D/%F %B/des-cbc
+@exec ln -sf %D/%F %B/des-cfb
+@exec ln -sf %D/%F %B/des-ecb
+@exec ln -sf %D/%F %B/des-ede
+@exec ln -sf %D/%F %B/des-ede-cbc
+@exec ln -sf %D/%F %B/des-ede-cfb
+@exec ln -sf %D/%F %B/des-ede-ofb
+@exec ln -sf %D/%F %B/des-ede3
+@exec ln -sf %D/%F %B/des-ede3-cbc
+@exec ln -sf %D/%F %B/des-ede3-cfb
+@exec ln -sf %D/%F %B/des-ede3-ofb
+@exec ln -sf %D/%F %B/des-ofb
+@exec ln -sf %D/%F %B/des3
+@exec ln -sf %D/%F %B/desx
+@exec ln -sf %D/%F %B/dgst
+@exec ln -sf %D/%F %B/dh
+@exec ln -sf %D/%F %B/dsa
+@exec ln -sf %D/%F %B/dsaparam
+@exec ln -sf %D/%F %B/enc
+@exec ln -sf %D/%F %B/errstr
+@exec ln -sf %D/%F %B/gendh
+@exec ln -sf %D/%F %B/gendsa
+@exec ln -sf %D/%F %B/genrsa
+@exec ln -sf %D/%F %B/idea
+@exec ln -sf %D/%F %B/idea-cbc
+@exec ln -sf %D/%F %B/idea-cfb
+@exec ln -sf %D/%F %B/idea-ecb
+@exec ln -sf %D/%F %B/idea-ofb
+@exec ln -sf %D/%F %B/md2
+@exec ln -sf %D/%F %B/md5
+@exec ln -sf %D/%F %B/mdc2
+@exec ln -sf %D/%F %B/pkcs7
+@exec ln -sf %D/%F %B/rc2
+@exec ln -sf %D/%F %B/rc2-cbc
+@exec ln -sf %D/%F %B/rc2-cfb
+@exec ln -sf %D/%F %B/rc2-ecb
+@exec ln -sf %D/%F %B/rc2-ofb
+@exec ln -sf %D/%F %B/rc4
+@exec ln -sf %D/%F %B/req
+@exec ln -sf %D/%F %B/rsa
+@exec ln -sf %D/%F %B/s_client
+@exec ln -sf %D/%F %B/s_server
+@exec ln -sf %D/%F %B/s_time
+@exec ln -sf %D/%F %B/sess_id
+@exec ln -sf %D/%F %B/sha
+@exec ln -sf %D/%F %B/sha1
+@exec ln -sf %D/%F %B/speed
+@exec ln -sf %D/%F %B/verify
+@exec ln -sf %D/%F %B/version
+@exec ln -sf %D/%F %B/x509
+@unexec rm %B/asn1parse
+@unexec rm %B/base64
+@unexec rm %B/bf
+@unexec rm %B/bf-cbc
+@unexec rm %B/bf-cfb
+@unexec rm %B/bf-ecb
+@unexec rm %B/bf-ofb
+@unexec rm %B/ca
+@unexec rm %B/ciphers
+@unexec rm %B/crl
+@unexec rm %B/crl2pkcs7
+@unexec rm %B/des
+@unexec rm %B/des-cbc
+@unexec rm %B/des-cfb
+@unexec rm %B/des-ecb
+@unexec rm %B/des-ede
+@unexec rm %B/des-ede-cbc
+@unexec rm %B/des-ede-cfb
+@unexec rm %B/des-ede-ofb
+@unexec rm %B/des-ede3
+@unexec rm %B/des-ede3-cbc
+@unexec rm %B/des-ede3-cfb
+@unexec rm %B/des-ede3-ofb
+@unexec rm %B/des-ofb
+@unexec rm %B/des3
+@unexec rm %B/desx
+@unexec rm %B/dgst
+@unexec rm %B/dh
+@unexec rm %B/dsa
+@unexec rm %B/dsaparam
+@unexec rm %B/enc
+@unexec rm %B/errstr
+@unexec rm %B/gendh
+@unexec rm %B/gendsa
+@unexec rm %B/genrsa
+@unexec rm %B/idea
+@unexec rm %B/idea-cbc
+@unexec rm %B/idea-cfb
+@unexec rm %B/idea-ecb
+@unexec rm %B/idea-ofb
+@unexec rm %B/md2
+@unexec rm %B/md5
+@unexec rm %B/mdc2
+@unexec rm %B/pkcs7
+@unexec rm %B/rc2
+@unexec rm %B/rc2-cbc
+@unexec rm %B/rc2-cfb
+@unexec rm %B/rc2-ecb
+@unexec rm %B/rc2-ofb
+@unexec rm %B/rc4
+@unexec rm %B/req
+@unexec rm %B/rsa
+@unexec rm %B/s_client
+@unexec rm %B/s_server
+@unexec rm %B/s_time
+@unexec rm %B/sess_id
+@unexec rm %B/sha
+@unexec rm %B/sha1
+@unexec rm %B/speed
+@unexec rm %B/verify
+@unexec rm %B/version
+@unexec rm %B/x509
 include/asn1.h
-include/txt_db.h
-include/stack.h
-include/ssl.h
-include/sha.h
-include/rsa.h
-include/rc4.h
-include/rc2.h
-include/rand.h
-include/pkcs7.h
-include/pem.h
-include/objects.h
-include/md5.h
-include/md2.h
-include/lhash.h
-include/idea.h
-include/err.h
-include/envelope.h
-include/dsa.h
-include/dh.h
-include/crypto.h
-include/cryptall.h
-include/conf.h
-include/buffer.h
-include/bn.h
-include/blowfish.h
 include/asn1_mac.h
+include/bio.h
+include/blowfish.h
+include/bn.h
+include/buffer.h
+include/conf.h
+include/cryptall.h
+include/crypto.h
+include/des.h
+include/dh.h
+include/dsa.h
+include/err.h
+include/evp.h
+include/idea.h
+include/lhash.h
+include/md2.h
+include/md5.h
+include/mdc2.h
+include/objects.h
+include/pem.h
+include/pkcs7.h
+include/rand.h
+include/rc2.h
+include/rc4.h
+include/rsa.h
+include/sha.h
+include/ssl.h
+include/ssl2.h
+include/ssl23.h
+include/ssl3.h
+include/stack.h
+include/txt_db.h
 include/x509.h
-lib/libssl.a
-@exec ranlib %D/%F
+include/x509_vfy.h
 lib/libcrypto.a
 @exec ranlib %D/%F
-lib/libRSAglue.a
+lib/libssl.a
 @exec ranlib %D/%F
+lib/ssleay.cnf
+share/doc/SSLeay/API.doc
 share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
 share/doc/SSLeay/asn1.doc
 share/doc/SSLeay/bio.doc
+share/doc/SSLeay/blowfish.doc
 share/doc/SSLeay/bn.doc
 share/doc/SSLeay/ca.1
 share/doc/SSLeay/callback.doc
 share/doc/SSLeay/cipher.doc
 share/doc/SSLeay/cipher.m
 share/doc/SSLeay/conf.doc
+share/doc/SSLeay/danger
 share/doc/SSLeay/des.doc
 share/doc/SSLeay/digest.doc
 share/doc/SSLeay/encode.doc
@@ -55,6 +194,7 @@ share/doc/SSLeay/lhash.doc
 share/doc/SSLeay/md2.doc
 share/doc/SSLeay/md5.doc
 share/doc/SSLeay/memory.doc
+share/doc/SSLeay/ms3-ca.doc
 share/doc/SSLeay/ns-ca.doc
 share/doc/SSLeay/obj.doc
 share/doc/SSLeay/rand.doc
@@ -69,6 +209,7 @@ share/doc/SSLeay/s_mult.doc
 share/doc/SSLeay/session.doc
 share/doc/SSLeay/sha.doc
 share/doc/SSLeay/speed.doc
+share/doc/SSLeay/ssl-ciph.doc
 share/doc/SSLeay/ssl.doc
 share/doc/SSLeay/ssl_ctx.doc
 share/doc/SSLeay/ssleay.doc
@@ -76,4 +217,6 @@ share/doc/SSLeay/ssluse.doc
 share/doc/SSLeay/stack.doc
 share/doc/SSLeay/threads.doc
 share/doc/SSLeay/txt_db.doc
+share/doc/SSLeay/verify
 share/doc/SSLeay/why.doc
+@unexec rm -rf share/doc/SSLeay