Upgrade to version 0.9.0b

5 files changed, 94 insertions, 144 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index 6e2674b98bc8..391f02e36d07 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Eric Young's SSL/Crypto Library
-# Version required:	0.8.1b
+# Version required:	0.9.0b
 # Date created:		15 Aug 1997
 # Whom:			markm@freebsd.org
 #
-# $Id: Makefile,v 1.18 1998/07/11 17:42:30 steve Exp $
+# $Id: Makefile,v 1.19 1998/08/21 22:04:29 max Exp $
 #
 
-DISTNAME=		SSLeay-0.8.1b
+DISTNAME=		SSLeay-0.9.0b
 CATEGORIES=		devel security
 MASTER_SITES=		ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/
 
diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo
index c4f112203bc0..f21f978227da 100644
--- a/security/openssl-beta/distinfo
+++ b/security/openssl-beta/distinfo
@@ -1 +1 @@
-MD5 (SSLeay-0.8.1b.tar.gz) = 4c386f17ba13ad097b3df1f2e5b019af
+MD5 (SSLeay-0.9.0b.tar.gz) = 41c26258b20af611e9995968cbd89688
diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
index 184f8010307e..0d390ca466d0 100644
--- a/security/openssl-beta/files/patch-ab
+++ b/security/openssl-beta/files/patch-ab
@@ -1,28 +1,18 @@
-*** Makefile.ssl.ORIG	Tue Feb 17 21:43:38 1998
---- Makefile.ssl	Tue Feb 17 21:46:22 1998
-***************
-*** 122,128 ****
-  	VERSION PROBLEMS MINFO makefile.one e_os.h \
-  	MICROSOFT makevms.com
-  WDIRS=	windows
-! LIBS=	libcrypto.a libssl.a 
-  
-  GENERAL=	Makefile
-  BASENAME=	SSLeay
---- 122,128 ----
-  	VERSION PROBLEMS MINFO makefile.one e_os.h \
-  	MICROSOFT makevms.com
-  WDIRS=	windows
-! LIBS=	libcrypto.a libssl.a libRSAglue.a
-  
-  GENERAL=	Makefile
-  BASENAME=	SSLeay
-***************
-*** 272,276 ****
---- 272,277 ----
-  		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
-  		chmod 644 $(INSTALLTOP)/lib/$$i ); \
-  	done
-+ 	cp apps/ssleay.cnf $(INSTALLTOP)/etc/ssleay.cnf.sample
-  
-  # DO NOT DELETE THIS LINE -- make depend depends on it.
+--- Makefile.ssl.orig	Fri Jun 26 10:25:25 1998
++++ Makefile.ssl	Sat Aug 22 13:14:34 1998
+@@ -175,7 +175,7 @@
+ 	VERSION PROBLEMS MINFO makefile.one e_os.h \
+ 	MICROSOFT makevms.com config PATENTS
+ WDIRS=  windows
+-LIBS=   libcrypto.a libssl.a 
++LIBS=	libcrypto.a libssl.a libRSAglue.a
+ 
+ GENERAL=        Makefile
+ BASENAME=       SSLeay
+@@ -327,5 +327,6 @@
+ 		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
+ 		chmod 644 $(INSTALLTOP)/lib/$$i ); \
+ 	done
++	cp apps/ssleay.cnf $(INSTALLTOP)/etc/ssleay.cnf.sample
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/security/openssl-beta/pkg-descr b/security/openssl-beta/pkg-descr
index ec90a11323c9..e67b8caabb2e 100644
--- a/security/openssl-beta/pkg-descr
+++ b/security/openssl-beta/pkg-descr
@@ -1,88 +1,22 @@
 The package includes
-
 libssl.a:
 	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,
-	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.
-
+	libdes - My libdes DES encryption.
+	RC4, RC2, Blowfish, IDEA encryption
   Digests
 	MD5 and MD2 message digest algorithms, fast implementations,
 	SHA (SHA-0) and SHA-1 message digest algorithms,
 	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.
-
+	RSA encryption/decryption/generation.
+	DSA encryption/decryption/generation.
+	Diffie-Hellman key-exchange/key generation.
+		 There is no limit on the number of bits.
   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.
+	X509 encoding/decoding into/from binary ASN1 and a PEM.
+	Program to generate RSA and DSA certificate requests and certificates.
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index b7eb615137d1..0fd1ee85f424 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -1,10 +1,3 @@
-bin/CA.sh
-bin/c_hash
-bin/c_info
-bin/c_issuer
-bin/c_name
-bin/c_rehash
-bin/der_chop
 bin/ssleay
 @exec ln -sf %D/%F %B/asn1parse
 @exec ln -sf %D/%F %B/base64
@@ -14,6 +7,12 @@ bin/ssleay
 @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/cast
+@exec ln -sf %D/%F %B/cast-cbc
+@exec ln -sf %D/%F %B/cast5-cbc
+@exec ln -sf %D/%F %B/cast5-cfb
+@exec ln -sf %D/%F %B/cast5-ecb
+@exec ln -sf %D/%F %B/cast5-ofb
 @exec ln -sf %D/%F %B/ciphers
 @exec ln -sf %D/%F %B/crl
 @exec ln -sf %D/%F %B/crl2pkcs7
@@ -39,7 +38,6 @@ bin/ssleay
 @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
@@ -56,6 +54,11 @@ bin/ssleay
 @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/rc5
+@exec ln -sf %D/%F %B/rc5-cbc
+@exec ln -sf %D/%F %B/rc5-cfb
+@exec ln -sf %D/%F %B/rc5-ecb
+@exec ln -sf %D/%F %B/rc5-ofb
 @exec ln -sf %D/%F %B/req
 @exec ln -sf %D/%F %B/rsa
 @exec ln -sf %D/%F %B/s_client
@@ -76,6 +79,12 @@ bin/ssleay
 @unexec rm %B/bf-ecb
 @unexec rm %B/bf-ofb
 @unexec rm %B/ca
+@unexec rm %B/cast
+@unexec rm %B/cast-cbc
+@unexec rm %B/cast5-cbc
+@unexec rm %B/cast5-cfb
+@unexec rm %B/cast5-ecb
+@unexec rm %B/cast5-ofb
 @unexec rm %B/ciphers
 @unexec rm %B/crl
 @unexec rm %B/crl2pkcs7
@@ -101,7 +110,6 @@ bin/ssleay
 @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
@@ -118,6 +126,11 @@ bin/ssleay
 @unexec rm %B/rc2-ecb
 @unexec rm %B/rc2-ofb
 @unexec rm %B/rc4
+@unexec rm %B/rc5
+@unexec rm %B/rc5-cbc
+@unexec rm %B/rc5-cfb
+@unexec rm %B/rc5-ecb
+@unexec rm %B/rc5-ofb
 @unexec rm %B/req
 @unexec rm %B/rsa
 @unexec rm %B/s_client
@@ -130,48 +143,62 @@ bin/ssleay
 @unexec rm %B/verify
 @unexec rm %B/version
 @unexec rm %B/x509
-include/asn1.h
-include/asn1_mac.h
-include/bio.h
-include/blowfish.h
-include/bn.h
-include/buffer.h
-include/conf.h
-include/cryptall.h
+bin/CA.sh
+bin/der_chop
+bin/c_hash
+bin/c_info
+bin/c_issuer
+bin/c_name
+bin/c_rehash
+etc/ssleay.cnf.sample
 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/cryptall.h
 include/md2.h
 include/md5.h
+include/sha.h
 include/mdc2.h
-include/objects.h
-include/pem.h
-include/pkcs7.h
-include/rand.h
+include/hmac.h
+include/ripemd.h
+include/des.h
 include/rc2.h
 include/rc4.h
+include/rc5.h
+include/idea.h
+include/blowfish.h
+include/cast.h
+include/bn.h
 include/rsa.h
-include/sha.h
-include/ssl.h
-include/ssl2.h
-include/ssl23.h
-include/ssl3.h
+include/dsa.h
+include/dh.h
+include/buffer.h
+include/bio.h
+include/bss_file.c
 include/stack.h
-include/txt_db.h
+include/lhash.h
+include/rand.h
+include/err.h
+include/objects.h
+include/evp.h
+include/pem.h
+include/asn1.h
+include/asn1_mac.h
 include/x509.h
 include/x509_vfy.h
-lib/libRSAglue.a
-@exec ranlib %D/%F
+include/conf.h
+include/txt_db.h
+include/pkcs7.h
+include/ssl.h
+include/ssl2.h
+include/ssl3.h
+include/ssl23.h
+include/tls1.h
+lib/ssleay.cnf
 lib/libcrypto.a
 @exec ranlib %D/%F
 lib/libssl.a
 @exec ranlib %D/%F
-etc/ssleay.cnf.sample
+lib/libRSAglue.a
+@exec ranlib %D/%F
 share/doc/SSLeay/API.doc
 share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
@@ -184,7 +211,6 @@ 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