diff --git a/packages/security/openssl/meta b/packages/security/openssl/meta index 6ad5d86afc..f29604563d 100644 --- a/packages/security/openssl/meta +++ b/packages/security/openssl/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="openssl" -PKG_VERSION="1.0.1a" +PKG_VERSION="1.0.1b" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/security/openssl/patches/openssl-1.0.1a-r22455.patch b/packages/security/openssl/patches/openssl-1.0.1a-r22455.patch deleted file mode 100644 index 8fc86f1798..0000000000 --- a/packages/security/openssl/patches/openssl-1.0.1a-r22455.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c openssl-1.0.1a.patch/crypto/evp/e_rc4_hmac_md5.c ---- openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c 2012-04-18 19:51:33.000000000 +0200 -+++ openssl-1.0.1a.patch/crypto/evp/e_rc4_hmac_md5.c 2012-04-22 20:02:50.270134862 +0200 -@@ -121,6 +121,7 @@ - md5_off = MD5_CBLOCK-key->md.num, - blocks; - unsigned int l; -+ extern unsigned int OPENSSL_ia32cap_P[]; - #endif - size_t plen = key->payload_length; - -@@ -132,7 +133,8 @@ - /* cipher has to "fall behind" */ - if (rc4_off>md5_off) md5_off+=MD5_CBLOCK; - -- if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK)) { -+ if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK) && -+ (OPENSSL_ia32cap_P[0]&(1<<20))==0) { - MD5_Update(&key->md,in,md5_off); - RC4(&key->ks,rc4_off,in,out); - -@@ -172,7 +174,8 @@ - if (md5_off>rc4_off) rc4_off += 2*MD5_CBLOCK; - else rc4_off += MD5_CBLOCK; - -- if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK)) { -+ if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK) && -+ (OPENSSL_ia32cap_P[0]&(1<<20))==0) { - RC4(&key->ks,rc4_off,in,out); - MD5_Update(&key->md,out,md5_off); - -@@ -289,8 +292,6 @@ - - const EVP_CIPHER *EVP_rc4_hmac_md5(void) - { -- extern unsigned int OPENSSL_ia32cap_P[]; -- /* RC4_CHAR flag ------------vvvvv */ -- return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher); -+ return(&r4_hmac_md5_cipher); - } - #endif