[arch-commits] Commit in openssl/trunk (4 files)

Pierre Schmitz pierre at archlinux.org
Wed May 28 12:41:17 EDT 2008


    Date: Wednesday, May 28, 2008 @ 12:41:17
  Author: pierre
Revision: 2164

upgpkg: openssl 0.9.8h-1

Modified:
  openssl/trunk/PKGBUILD
Deleted:
  openssl/trunk/key-length.patch
  openssl/trunk/openssl-0.9.8-gcc42.patch
  openssl/trunk/openssl-0.9.8e-security-fix.patch

-----------------------------------+
 PKGBUILD                          |   11 -
 key-length.patch                  |   11 -
 openssl-0.9.8-gcc42.patch         |  295 ------------------------------------
 openssl-0.9.8e-security-fix.patch |   42 -----
 4 files changed, 6 insertions(+), 353 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-05-28 02:32:32 UTC (rev 2163)
+++ PKGBUILD	2008-05-28 16:41:17 UTC (rev 2164)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 pkgname=openssl
-pkgver=0.9.8g
-pkgrel=2
+pkgver=0.9.8h
+pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('i686' 'x86_64')
 url='http://www.openssl.org'
@@ -11,13 +11,14 @@
 depends=('glibc')
 options=('!makeflags')
 source=("http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz" \
-        'http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8e-fix_manpages-1.patch')
-md5sums=('acf70a16359bf3658bdfb74bda1c4419' '04a6a88c2ee4badd4f8649792b73eaf3')
+        'http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8g-fix_manpages-1.patch')
+md5sums=('7d3d41dafc76cf2fcb5559963b5783b3'
+         '04a6a88c2ee4badd4f8649792b73eaf3')
 
 build() {
 	cd $startdir/src/$pkgname-$pkgver
 
-	patch -p1 -i ../openssl-0.9.8e-fix_manpages-1.patch  || return 1
+	patch -p1 -i ../openssl-0.9.8g-fix_manpages-1.patch  || return 1
 	./config --prefix=/usr --openssldir=/etc/ssl shared
 
 	make || return 1

Deleted: key-length.patch
===================================================================
--- key-length.patch	2008-05-28 02:32:32 UTC (rev 2163)
+++ key-length.patch	2008-05-28 16:41:17 UTC (rev 2164)
@@ -1,11 +0,0 @@
---- crypto/evp/evp_lib.c	2006/11/29 20:47:13	1.10.2.1
-+++ crypto/evp/evp_lib.c	2007/02/27 18:42:52	1.10.2.2
-@@ -225,7 +225,7 @@
- 
- int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
- 	{
--	return ctx->cipher->key_len;
-+	return ctx->key_len;
- 	}
- 
- int EVP_CIPHER_nid(const EVP_CIPHER *cipher)

Deleted: openssl-0.9.8-gcc42.patch
===================================================================
--- openssl-0.9.8-gcc42.patch	2008-05-28 02:32:32 UTC (rev 2163)
+++ openssl-0.9.8-gcc42.patch	2008-05-28 16:41:17 UTC (rev 2164)
@@ -1,295 +0,0 @@
-Ripped from PLD Linux for gcc-4.2
-
-http://bugs.gentoo.org/158324
-
---- openssl-0.9.8e/crypto/asn1/asn1.h.gcc42~	2006-02-19 14:45:22.000000000 +0100
-+++ openssl-0.9.8e/crypto/asn1/asn1.h	2007-03-04 12:35:59.000000000 +0100
-@@ -902,23 +902,26 @@
- 
- /* Used to implement other functions */
- void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
-+extern const void *__ASN1_dup;
- #define ASN1_dup_of(type,i2d,d2i,x) \
--	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
-+	((type *(*)(I2D_OF(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,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 *(*)(I2D_OF_const(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,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);
-+extern const void *__ASN1_d2i_fp;
- #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 *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))__ASN1_d2i_fp)(xnew,d2i,in,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);
-+extern const void *__ASN1_i2d_fp;
- #define ASN1_i2d_fp_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
-+	((int (*)(I2D_OF(type),FILE *,type *))__ASN1_i2d_fp)(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)
-+	((int (*)(I2D_OF_const(type),FILE *,type *))__ASN1_i2d_fp)(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
-@@ -927,14 +930,16 @@
- 
- #ifndef OPENSSL_NO_BIO
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
-+extern const void *__ASN1_d2i_bio;
- #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 *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))__ASN1_d2i_bio)(xnew,d2i,in,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);
-+extern const void *__ASN1_i2d_bio;
- #define ASN1_i2d_bio_of(type,i2d,out,x) \
--	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
-+	((int (*)(I2D_OF(type),BIO *,type *))__ASN1_i2d_bio)(i2d,out,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)
-+	((int (*)(I2D_OF_const(type),BIO *,const type *))__ASN1_i2d_bio)(i2d,out,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);
-@@ -977,8 +982,9 @@
- void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
- ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
- 			      ASN1_OCTET_STRING **oct);
-+extern const void *__ASN1_pack_string;
- #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_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))__ASN1_pack_string)(obj,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);
---- openssl-0.9.8e/crypto/ocsp/ocsp.h.gcc42~	2005-05-13 01:01:43.000000000 +0200
-+++ openssl-0.9.8e/crypto/ocsp/ocsp.h	2007-03-04 12:35:59.000000000 +0100
-@@ -468,8 +468,9 @@
- 
- ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
- 				void *data, STACK_OF(ASN1_OBJECT) *sk);
-+extern const void *__ASN1_STRING_encode;
- #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 *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))__ASN1_STRING_encode)(s,i2d,data,sk)
- 
- X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
- 
---- openssl-0.9.8e/crypto/pem/pem.h.gcc42~	2006-12-19 20:47:36.000000000 +0100
-+++ openssl-0.9.8e/crypto/pem/pem.h	2007-03-04 12:44:19.000000000 +0100
-@@ -220,19 +220,19 @@
- #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 *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))__PEM_ASN1_read)(d2i_##asn1, str,fp,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(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,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(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
- }
- 
- #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-@@ -240,7 +243,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(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-@@ -248,7 +252,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(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #endif
-@@ -256,33 +261,33 @@
- #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 *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))__PEM_ASN1_read_bio)(d2i_##asn1, str,bp,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(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,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(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,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(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,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(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
- 	}
- 
- #define IMPLEMENT_PEM_write(name, type, str, asn1) \
-@@ -545,13 +555,15 @@
- 	     pem_password_cb *cb, void *u);
- void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
- 			  void **x, pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_read_bio;
- #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 *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))__PEM_ASN1_read_bio)(d2i,name,bp,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);
-+extern const void *__PEM_ASN1_write_bio;
- #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)
-+	((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d,name,bp,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,
-@@ -566,11 +566,13 @@
- int	PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
- void *  PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
- 		      pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_read;
- int	PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
- 		       char *x,const EVP_CIPHER *enc,unsigned char *kstr,
- 		       int klen,pem_password_cb *callback, void *u);
- STACK_OF(X509_INFO) *	PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
- 	pem_password_cb *cb, void *u);
-+extern const void *__PEM_ASN1_write;
- #endif
- 
- int	PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
---- openssl-0.9.8e/crypto/asn1/a_d2i_fp.c.ark	2007-04-17 17:50:28.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/a_d2i_fp.c	2007-04-17 19:17:24.000000000 +0000
-@@ -81,6 +81,7 @@
-         BIO_free(b);
-         return(ret);
-         }
-+const void * __attribute__((unused)) __ASN1_d2i_fp=(const void*)openssl_fcast(ASN1_d2i_fp);
- #endif
- 
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
-@@ -99,6 +100,7 @@
- 	if (b != NULL) BUF_MEM_free(b);
- 	return(ret);
- 	}
-+const void * __attribute__((unused)) __ASN1_d2i_bio=(const void*)openssl_fcast(ASN1_d2i_bio);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/asn1/a_dup.c.ark	2007-04-17 17:49:31.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/a_dup.c	2007-04-17 17:49:59.000000000 +0000
-@@ -82,6 +82,7 @@
- 	OPENSSL_free(b);
- 	return(ret);
- 	}
-+const void * __attribute__((unused)) __ASN1_dup=(const void*)openssl_fcast(ASN1_dup);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/asn1/a_i2d_fp.c.ark	2007-04-17 17:52:19.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/a_i2d_fp.c	2007-04-17 19:19:29.000000000 +0000
-@@ -79,6 +79,7 @@
-         BIO_free(b);
-         return(ret);
-         }
-+const void * __attribute__((unused)) __ASN1_i2d_fp=(const void*)openssl_fcast(ASN1_i2d_fp);
- #endif
- 
- int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
-@@ -113,6 +114,7 @@
- 	OPENSSL_free(b);
- 	return(ret);
- 	}
-+const void * __attribute__((unused)) __ASN1_i2d_bio=(const void*)openssl_fcast(ASN1_i2d_bio);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/asn1/asn_pack.c.ark	2007-04-17 19:18:35.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/asn_pack.c	2007-04-17 19:19:20.000000000 +0000
-@@ -144,6 +144,7 @@
- 	i2d (obj, &p);
- 	return octmp;
- }
-+const void * __attribute__((unused)) __ASN1_pack_string=(const void*)openssl_fcast(ASN1_pack_string);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/ocsp/ocsp_ext.c.ark	2007-04-17 19:20:35.000000000 +0000
-+++ openssl-0.9.8e/crypto/ocsp/ocsp_ext.c	2007-04-17 19:21:19.000000000 +0000
-@@ -305,6 +305,7 @@
- 	if (b) OPENSSL_free(b);
- 	return NULL;
- 	}
-+const void * __attribute__((unused)) __ASN1_STRING_encode=(const void*)openssl_fcast(ASN1_STRING_encode);
- 
- /* Nonce handling functions */
- 
---- openssl-0.9.8e/crypto/pem/pem_lib.c.ark	2007-04-17 19:21:44.000000000 +0000
-+++ openssl-0.9.8e/crypto/pem/pem_lib.c	2007-04-17 19:26:35.000000000 +0000
-@@ -174,6 +174,7 @@
-         BIO_free(b);
-         return(ret);
- 	}
-+const void * __attribute__((unused)) __PEM_ASN1_read=(const void*)openssl_fcast(PEM_ASN1_read);
- #endif
- 
- static int check_pem(const char *nm, const char *name)
-@@ -277,6 +278,7 @@
-         BIO_free(b);
-         return(ret);
-         }
-+const void * __attribute__((unused)) __PEM_ASN1_write=(const void*)openssl_fcast(PEM_ASN1_write);
- #endif
- 
- int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
-@@ -381,6 +383,7 @@
- 		}
- 	return(ret);
- 	}
-+const void * __attribute__((unused)) __PEM_ASN1_write_bio=(const void*)openssl_fcast(PEM_ASN1_write_bio);
- 
- int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
- 	     pem_password_cb *callback,void *u)
---- openssl-0.9.8e/crypto/pem/pem_oth.c.ark	2007-04-17 19:27:10.000000000 +0000
-+++ openssl-0.9.8e/crypto/pem/pem_oth.c	2007-04-17 19:30:00.000000000 +0000
-@@ -84,3 +84,4 @@
- 	OPENSSL_free(data);
- 	return(ret);
- 	}
-+const void * __attribute__((unused)) __PEM_ASN1_read_bio=(const void*)openssl_fcast(PEM_ASN1_read_bio);

Deleted: openssl-0.9.8e-security-fix.patch
===================================================================
--- openssl-0.9.8e-security-fix.patch	2008-05-28 02:32:32 UTC (rev 2163)
+++ openssl-0.9.8e-security-fix.patch	2008-05-28 16:41:17 UTC (rev 2164)
@@ -1,42 +0,0 @@
---- ssl/ssl_lib.c
-+++ ssl/ssl_lib.c
-@@ -1201,7 +1201,6 @@
- char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
- 	{
- 	char *p;
--	const char *cp;
- 	STACK_OF(SSL_CIPHER) *sk;
- 	SSL_CIPHER *c;
- 	int i;
-@@ -1214,20 +1213,21 @@
- 	sk=s->session->ciphers;
- 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
- 		{
--		/* Decrement for either the ':' or a '\0' */
--		len--;
-+		int n;
-+
- 		c=sk_SSL_CIPHER_value(sk,i);
--		for (cp=c->name; *cp; )
-+		n=strlen(c->name);
-+		if (n+1 > len)
- 			{
--			if (len-- <= 0)
--				{
--				*p='\0';
--				return(buf);
--				}
--			else
--				*(p++)= *(cp++);
-+			if (p != buf)
-+				--p;
-+			*p='\0';
-+			return buf;
- 			}
-+		strcpy(p,c->name);
-+		p+=n;
- 		*(p++)=':';
-+		len-=n+1;
- 		}
- 	p[-1]='\0';
- 	return(buf);





More information about the arch-commits mailing list