- Secuurity update to 0.9.8f

Security: CVE-2007-4995

5 files changed, 5 insertions, 211 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index cfa32b67f8b..b968dfaac50 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -14,8 +14,8 @@ PORTREVISION!=	date -v-1d +%Y%m%d
 PORTVERSION=	0.9.7m
 PORTREVISION?=	0
 .else
-PORTVERSION=	0.9.8e
-PORTREVISION?=	1
+PORTVERSION=	0.9.8f
+PORTREVISION?=	0
 .endif
 .endif
 CATEGORIES=	security devel
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 599f7fa1135..33fa91b8338 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,6 +1,6 @@
 MD5 (openssl-0.9.7m.tar.gz) = 74a4d1b87e1e6e1ec95dbe58cb4c5b9a
 SHA256 (openssl-0.9.7m.tar.gz) = c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
 SIZE (openssl-0.9.7m.tar.gz) = 3303943
-MD5 (openssl-0.9.8e.tar.gz) = 3a7ff24f6ea5cd711984722ad654b927
-SHA256 (openssl-0.9.8e.tar.gz) = 414e8428b95fbc51707965fda31390497d058290356426bfe084b49464a60340
-SIZE (openssl-0.9.8e.tar.gz) = 3341665
+MD5 (openssl-0.9.8f.tar.gz) = 114bf908eb1b293d11d3e6b18a09269f
+SHA256 (openssl-0.9.8f.tar.gz) = be5afd386f5d7acff019acaf46cdaad89a8b42cc9cee85d1adb2774627f32b42
+SIZE (openssl-0.9.8f.tar.gz) = 3357445
diff --git a/security/openssl/files-beta/patch-config b/security/openssl/files-beta/patch-config
deleted file mode 100644
index 59cd1ec2719..00000000000
--- a/security/openssl/files-beta/patch-config
+++ /dev/null
@@ -1,13 +0,0 @@
---- config.orig	Sun Jun 26 20:10:20 2005
-+++ config	Sun Jul 10 14:46:38 2005
-@@ -654,8 +654,8 @@
-   *-*-sunos4)		OUT="sunos-$CC" ;;
- 
-   *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
--  alpha*-*-*bsd*)	OUT="BSD-generic64; options="$options -DL_ENDIAN" ;;
--  powerpc64-*-*bsd*)	OUT="BSD-generic64; options="$options -DB_ENDIAN" ;;
-+  alpha*-*-*bsd*)	OUT="BSD-alpha" ;;
-+  powerpc64-*-*bsd*)	OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
-   sparc64-*-*bsd*)	OUT="BSD-sparc64" ;;
-   ia64-*-*bsd*)		OUT="BSD-ia64" ;;
-   amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
diff --git a/security/openssl/files-beta/patch-doc-crypto-des_modes.pod b/security/openssl/files-beta/patch-doc-crypto-des_modes.pod
deleted file mode 100644
index 3584dda10a1..00000000000
--- a/security/openssl/files-beta/patch-doc-crypto-des_modes.pod
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/crypto/des_modes.pod.orig	Tue Mar  5 16:30:13 2002
-+++ doc/crypto/des_modes.pod	Tue Sep 30 18:58:27 2003
-@@ -2,7 +2,7 @@
- 
- =head1 NAME
- 
--Modes of DES - the variants of DES and other crypto algorithms of OpenSSL
-+Modes_of_DES - the variants of DES and other crypto algorithms of OpenSSL
- 
- =head1 DESCRIPTION
- 
diff --git a/security/openssl/files-beta/patch-gcc42 b/security/openssl/files-beta/patch-gcc42
deleted file mode 100644
index e3a5753be14..00000000000
--- a/security/openssl/files-beta/patch-gcc42
+++ /dev/null
@@ -1,182 +0,0 @@
-Index:crypto/asn1/asn1.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/asn1/asn1.h,v
-retrieving revision 1.1.1.8
-diff -u -r1.1.1.8 asn1.h
----crypto/asn1/asn1.h	29 Jul 2006 19:10:16 -0000	1.1.1.8
-+++crypto/asn1/asn1.h	20 May 2007 05:01:40 -0000
-@@ -903,22 +903,22 @@
- /* Used to implement other functions */
- void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
- #define ASN1_dup_of(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
- #define ASN1_dup_of_const(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
- 
- void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
- 
- #ifndef OPENSSL_NO_FP_API
- void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
- #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
--	((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
-+	((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
- void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
- int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
- #define ASN1_i2d_fp_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
- #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
--	((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
- int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
- int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
- #endif
-@@ -928,13 +928,13 @@
- #ifndef OPENSSL_NO_BIO
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
- #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
--	((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
-+	((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
- void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
- int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
- #define ASN1_i2d_bio_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
- #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
--	((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
- int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
- int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
- int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
-@@ -978,7 +978,7 @@
- ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
- 			      ASN1_OCTET_STRING **oct);
- #define ASN1_pack_string_of(type,obj,i2d,oct) \
--	((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
-+    	(ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct)))
- ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
- 
- void ASN1_STRING_set_default_mask(unsigned long mask);
-Index:crypto/ocsp/ocsp.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/ocsp/ocsp.h,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 ocsp.h
----crypto/ocsp/ocsp.h	29 Jul 2006 19:10:18 -0000	1.1.1.2
-+++crypto/ocsp/ocsp.h	20 May 2007 05:13:06 -0000
-@@ -469,7 +469,7 @@
- ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
- 				void *data, STACK_OF(ASN1_OBJECT) *sk);
- #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
--((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
-+(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk)))
- 
- X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
- 
-Index:crypto/pem/pem.h
-===================================================================
-RCS file: /home/ncvs/src/crypto/openssl/crypto/pem/pem.h,v
-retrieving revision 1.1.1.7
-diff -u -r1.1.1.7 pem.h
----crypto/pem/pem.h	15 Mar 2007 20:03:01 -0000	1.1.1.7
-+++crypto/pem/pem.h	20 May 2007 06:02:41 -0000
-@@ -220,19 +220,20 @@
- #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
- type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
--} 
-+return((type *)PEM_ASN1_read( \
-+	(d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \
-+}
- 
- #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
- 
- #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
- int PEM_write_##name(FILE *fp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
- 
- #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-@@ -240,7 +241,7 @@
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
- 		  void *u) \
- 	{ \
--	return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-@@ -248,7 +249,7 @@
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, \
- 		  void *u) \
- 	{ \
--	return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #endif
-@@ -256,33 +257,34 @@
- #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
- type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
- { \
--return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \
-+return((type *)PEM_ASN1_read_bio( \
-+	(d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \
- }
- 
- #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x) \
- { \
--return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
- 
- #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, const type *x) \
- { \
--return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
- }
- 
- #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- 	{ \
--	return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
- int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
- 	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
- 	{ \
--	return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
-+return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #define IMPLEMENT_PEM_write(name, type, str, asn1) \
-@@ -546,12 +548,12 @@
- void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
- 			  void **x, pem_password_cb *cb, void *u);
- #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
--((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
-+((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u))
- int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
- 			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
- 			   pem_password_cb *cb, void *u);
- #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
--	((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)
-+	(PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u)
- 
- STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
- int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,