openssl: bump to 1.0.1u & 1.0.2i. (#810)

This commit is contained in:
fbrosson
2016-09-23 21:11:30 +00:00
committed by waddlesplash
parent c1977284cc
commit 918ced0b20
4 changed files with 8 additions and 8 deletions

View File

@@ -17,7 +17,7 @@ COPYRIGHT="1995-1998 Eric Young
LICENSE="OpenSSL"
REVISION="1"
SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz"
CHECKSUM_SHA256="4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088"
CHECKSUM_SHA256="4312b4ca1215b6f2c97007503d80db80d5157f76f8f7d3febbe6b4c56ff26739"
PATCHES="openssl-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"

View File

@@ -17,7 +17,7 @@ COPYRIGHT="1995-1998 Eric Young
LICENSE="OpenSSL"
REVISION="1"
SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz"
CHECKSUM_SHA256="1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"
CHECKSUM_SHA256="9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f"
PATCHES="openssl-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"

View File

@@ -5,7 +5,7 @@ Subject: Haiku: build fixes
diff --git a/Configure b/Configure
index 93c4cc1..d03daf4 100755
index 6a50cb1..9575f20 100755
--- a/Configure
+++ b/Configure
@@ -451,6 +451,10 @@ my %table=(

View File

@@ -5,7 +5,7 @@ Subject: Haiku: build fixes
diff --git a/Configure b/Configure
index c98107a..b508a92 100755
index c39f71a..7c90be9 100755
--- a/Configure
+++ b/Configure
@@ -506,6 +506,10 @@ my %table=(
@@ -20,7 +20,7 @@ index c98107a..b508a92 100755
#
# Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.
diff --git a/Makefile.shared b/Makefile.shared
index a2aa980..2b585a0 100644
index e8d222a..2216c8b 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -594,10 +594,10 @@ symlink.hpux:
@@ -140,12 +140,12 @@ index 46c9d03..4a9ad27 100644
extern unsigned int OPENSSL_ia32cap_P[];
# define AESNI_CAPABLE (1<<(57-32))
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 2da1117..d41ba7f 100644
index 5e92855..cec694a 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -101,8 +101,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
# if !defined(OPENSSL_NO_ASM) && ( \
# if defined(RC4_ASM) && defined(MD5_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined(_M_X64) || \
- defined(__INTEL__) ) && \
@@ -154,7 +154,7 @@ index 2da1117..d41ba7f 100644
# define STITCHED_CALL
# endif
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 3798902..8caca14 100644
index be37ef0..b33ece3 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -125,8 +125,7 @@