Updated the bundled OpenSSL version to 1.0.2l.

6 files changed, 23 insertions, 6 deletions

diff --git a/dev/scripts/builders/build.lib.params.sh b/dev/scripts/builders/build.lib.params.sh
index 34aeb030..ab530788 100644
--- a/dev/scripts/builders/build.lib.params.sh
+++ b/dev/scripts/builders/build.lib.params.sh
@@ -15,7 +15,7 @@ MYSQL="mysql-5.1.73"
 GEOIP="GeoIP-1.4.8"
 CLAMAV="clamav-0.98.4"
 CHECKER="check-0.11.0"
-OPENSSL="openssl-1.0.2k"
+OPENSSL="openssl-1.0.2l"
 GOOGTAP="gtest-tap-listener-0.5"
 GOOGTEST="googletest-release-1.7.0"
 JANSSON="jansson-2.2.1"
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh
index 99a3379a..687adcba 100755
--- a/dev/scripts/builders/build.lib.sh
+++ b/dev/scripts/builders/build.lib.sh
@@ -78,8 +78,8 @@ gd() {
 			cat "$M_PATCHES/gd/"gd-2.0.34-fonts.patch | patch -s -p1 -b --suffix .fonts --fuzz=0; error
 			cat "$M_PATCHES/gd/"gd-2.0.35-time.patch | patch -s -p1 -b --suffix .time --fuzz=0; error
 			cat "$M_PATCHES/gd/"gd-2.0.35-security3.patch | patch -s -p1 -b --suffix .sec3 --fuzz=0; error
-			cat "$M_PATCHES/gd/"gd-version.patch | patch -s -p1 -b --fuzz=0; error; error
-			cat "$M_PATCHES/gd/"gd-sigcmp.patch | patch -s -p1 -b --fuzz=0; error; error
+			cat "$M_PATCHES/gd/"gd-version.patch | patch -s -p1 -b --fuzz=0; error
+			cat "$M_PATCHES/gd/"gd-sigcmp.patch | patch -s -p1 -b --fuzz=0; error
 		;;
 		gd-build)
 			cd "$M_SOURCES/gd"; error
@@ -463,7 +463,7 @@ curl() {
 			# The target 'check' is an alias for the targets 'test' and 'examples'
 			cd "$M_SOURCES/curl"; error
 			export LD_LIBRARY_PATH="$M_LDPATH"; error
-			make --jobs=4 examples &>> "$M_LOGS/curl.txt"; error; error
+			make --jobs=4 examples &>> "$M_LOGS/curl.txt"; error
 			make --jobs=4 test &>> "$M_LOGS/curl.txt"; error
 		;;
 		curl-check-full)
@@ -471,7 +471,7 @@ curl() {
 			# The target 'check' is an alias for the targets 'test' and 'examples'
 			cd "$M_SOURCES/curl"; error
 			export LD_LIBRARY_PATH="$M_LDPATH"; error
-			make --jobs=4 examples &>> "$M_LOGS/curl.txt"; error; error
+			make --jobs=4 examples &>> "$M_LOGS/curl.txt"; error
 			make --jobs=4 test &>> "$M_LOGS/curl.txt"; error
 			make --jobs=4 test-full &>> "$M_LOGS/curl.txt"; error
 
@@ -1765,7 +1765,9 @@ memcached() {
 			# doesn't appear to include the libraries automatically.
 			export LIBS="-lm -lstdc++"
 			
-			# unset MEMCACHED_SERVERS
+			# For some reason, the unit tests will fail when using this environment variable to find the memcached server.
+			unset MEMCACHED_SERVERS
+			
 			# export GEARMAND_BINARY="/usr/local/sbin/gearmand"
 			# export MEMCACHED_BINARY="/usr/local/bin/memcached"
 
@@ -1795,6 +1797,9 @@ memcached() {
 		memcached-check)
 			cd "$M_SOURCES/memcached"; error
 			export LD_LIBRARY_PATH="$M_LDPATH"; error
+			
+			# For some reason, the unit tests will fail when using this environment variable to find the memcached server.
+			unset MEMCACHED_SERVERS
 
 			# Doesn't appear to be necessary anymore...
 			#rm -vf /tmp/memcached.pid* &>> "$M_LOGS/memcached.txt"; error
@@ -1807,6 +1812,9 @@ memcached() {
 		memcached-check-full)
 			cd "$M_SOURCES/memcached"; error
 			export LD_LIBRARY_PATH="$M_LDPATH"; error
+			
+			# For some reason, the unit tests will fail when using this environment variable to find the memcached server.
+			unset MEMCACHED_SERVERS
 
 			# Doesn't appear to be necessary anymore...
 			#rm -vf /tmp/memcached.pid* &>> "$M_LOGS/memcached.txt"; error
diff --git a/lib/archives/openssl-1.0.2k.tar.gz b/lib/archives/openssl-1.0.2k.tar.gz
deleted file mode 100644
index d22a1701..00000000
--- a/lib/archives/openssl-1.0.2k.tar.gz
+++ /dev/null
diff --git a/lib/archives/openssl-1.0.2l.tar.gz b/lib/archives/openssl-1.0.2l.tar.gz
new file mode 100644
index 00000000..72be295e
--- /dev/null
+++ b/lib/archives/openssl-1.0.2l.tar.gz
diff --git a/lib/check/magma.open.symbols.c b/lib/check/magma.open.symbols.c
index d221d204..2e88c2f6 100644
--- a/lib/check/magma.open.symbols.c
+++ b/lib/check/magma.open.symbols.c
@@ -190,6 +190,7 @@ void (*SSL_load_error_strings_d)(void) = NULL;
 int (*EVP_MD_type_d)(const EVP_MD *md) = NULL;
 void (*ECDSA_SIG_free_d)(ECDSA_SIG *a) = NULL;
 X509_STORE * (*X509_STORE_new_d)(void) = NULL;
+unsigned long (*ERR_peek_error_d)(void) = NULL;
 const EVP_MD * (*EVP_ripemd160_d)(void) = NULL;
 const char * (*SSLeay_version_d)(int t) = NULL;
 void (*ERR_load_crypto_strings_d)(void) = NULL;
@@ -226,6 +227,7 @@ EC_KEY * (*EC_KEY_new_by_curve_name_d)(int nid) = NULL;
 int (*BN_hex2bn_d)(BIGNUM **a, const char *str) = NULL;
 int (*SSL_read_d)(SSL *ssl, void *buf, int num) = NULL;
 int (*i2d_X509_d)(X509 *a, unsigned char **out) = NULL;
+const char * (*SSL_get_version_d)(const SSL *s) = NULL;
 int (*RAND_bytes_d)(unsigned char *buf, int num) = NULL;
 void (*EVP_CIPHER_CTX_init_d)(EVP_CIPHER_CTX *a) = NULL;
 void (*OCSP_BASICRESP_free_d)(OCSP_BASICRESP *a) = NULL;
@@ -307,6 +309,7 @@ int (*EC_KEY_set_public_key_d)(EC_KEY *key, const EC_POINT *pub) = NULL;
 ASN1_STRING * (*X509_NAME_ENTRY_get_data_d)(X509_NAME_ENTRY *ne) = NULL;
 int (*i2d_ECDSA_SIG_d)(const ECDSA_SIG *sig, unsigned char **pp) = NULL;
 X509 * (*X509_STORE_CTX_get_current_cert_d)(X509_STORE_CTX *ctx) = NULL;
+int (*SSL_CIPHER_get_bits_d)(const SSL_CIPHER *c, int *alg_bits) = NULL;
 int (*i2d_OCSP_RESPONSE_d)(OCSP_RESPONSE *a, unsigned char **out) = NULL;
 struct stack_st_X509 * (*SSL_get_peer_cert_chain_d)(const SSL *s) = NULL;
 unsigned long (*EVP_CIPHER_CTX_flags_d)(const EVP_CIPHER_CTX *ctx) = NULL;
@@ -733,6 +736,7 @@ if ((*(void **)&(SSL_load_error_strings_d) = dlsym(magma, "SSL_load_error_string
 if ((*(void **)&(EVP_MD_type_d) = dlsym(magma, "EVP_MD_type")) == NULL) return "EVP_MD_type";
 if ((*(void **)&(ECDSA_SIG_free_d) = dlsym(magma, "ECDSA_SIG_free")) == NULL) return "ECDSA_SIG_free";
 if ((*(void **)&(X509_STORE_new_d) = dlsym(magma, "X509_STORE_new")) == NULL) return "X509_STORE_new";
+if ((*(void **)&(ERR_peek_error_d) = dlsym(magma, "ERR_peek_error")) == NULL) return "ERR_peek_error";
 if ((*(void **)&(EVP_ripemd160_d) = dlsym(magma, "EVP_ripemd160")) == NULL) return "EVP_ripemd160";
 if ((*(void **)&(SSLeay_version_d) = dlsym(magma, "SSLeay_version")) == NULL) return "SSLeay_version";
 if ((*(void **)&(ERR_load_crypto_strings_d) = dlsym(magma, "ERR_load_crypto_strings")) == NULL) return "ERR_load_crypto_strings";
@@ -769,6 +773,7 @@ if ((*(void **)&(EC_KEY_new_by_curve_name_d) = dlsym(magma, "EC_KEY_new_by_curve
 if ((*(void **)&(BN_hex2bn_d) = dlsym(magma, "BN_hex2bn")) == NULL) return "BN_hex2bn";
 if ((*(void **)&(SSL_read_d) = dlsym(magma, "SSL_read")) == NULL) return "SSL_read";
 if ((*(void **)&(i2d_X509_d) = dlsym(magma, "i2d_X509")) == NULL) return "i2d_X509";
+if ((*(void **)&(SSL_get_version_d) = dlsym(magma, "SSL_get_version")) == NULL) return "SSL_get_version";
 if ((*(void **)&(RAND_bytes_d) = dlsym(magma, "RAND_bytes")) == NULL) return "RAND_bytes";
 if ((*(void **)&(EVP_CIPHER_CTX_init_d) = dlsym(magma, "EVP_CIPHER_CTX_init")) == NULL) return "EVP_CIPHER_CTX_init";
 if ((*(void **)&(OCSP_BASICRESP_free_d) = dlsym(magma, "OCSP_BASICRESP_free")) == NULL) return "OCSP_BASICRESP_free";
@@ -850,6 +855,7 @@ if ((*(void **)&(EC_KEY_set_public_key_d) = dlsym(magma, "EC_KEY_set_public_key"
 if ((*(void **)&(X509_NAME_ENTRY_get_data_d) = dlsym(magma, "X509_NAME_ENTRY_get_data")) == NULL) return "X509_NAME_ENTRY_get_data";
 if ((*(void **)&(i2d_ECDSA_SIG_d) = dlsym(magma, "i2d_ECDSA_SIG")) == NULL) return "i2d_ECDSA_SIG";
 if ((*(void **)&(X509_STORE_CTX_get_current_cert_d) = dlsym(magma, "X509_STORE_CTX_get_current_cert")) == NULL) return "X509_STORE_CTX_get_current_cert";
+if ((*(void **)&(SSL_CIPHER_get_bits_d) = dlsym(magma, "SSL_CIPHER_get_bits")) == NULL) return "SSL_CIPHER_get_bits";
 if ((*(void **)&(i2d_OCSP_RESPONSE_d) = dlsym(magma, "i2d_OCSP_RESPONSE")) == NULL) return "i2d_OCSP_RESPONSE";
 if ((*(void **)&(SSL_get_peer_cert_chain_d) = dlsym(magma, "SSL_get_peer_cert_chain")) == NULL) return "SSL_get_peer_cert_chain";
 if ((*(void **)&(EVP_CIPHER_CTX_flags_d) = dlsym(magma, "EVP_CIPHER_CTX_flags")) == NULL) return "EVP_CIPHER_CTX_flags";
diff --git a/lib/check/magma.open.symbols.h b/lib/check/magma.open.symbols.h
index 4a6720d8..36d26d35 100644
--- a/lib/check/magma.open.symbols.h
+++ b/lib/check/magma.open.symbols.h
@@ -318,6 +318,7 @@ extern void (*SSL_load_error_strings_d)(void);
 extern int (*EVP_MD_type_d)(const EVP_MD *md);
 extern void (*ECDSA_SIG_free_d)(ECDSA_SIG *a);
 extern X509_STORE * (*X509_STORE_new_d)(void);
+extern unsigned long (*ERR_peek_error_d)(void);
 extern const EVP_MD * (*EVP_ripemd160_d)(void);
 extern const char * (*SSLeay_version_d)(int t);
 extern void (*ERR_load_crypto_strings_d)(void);
@@ -354,6 +355,7 @@ extern EC_KEY * (*EC_KEY_new_by_curve_name_d)(int nid);
 extern int (*BN_hex2bn_d)(BIGNUM **a, const char *str);
 extern int (*SSL_read_d)(SSL *ssl, void *buf, int num);
 extern int (*i2d_X509_d)(X509 *a, unsigned char **out);
+extern const char * (*SSL_get_version_d)(const SSL *s);
 extern int (*RAND_bytes_d)(unsigned char *buf, int num);
 extern void (*EVP_CIPHER_CTX_init_d)(EVP_CIPHER_CTX *a);
 extern void (*OCSP_BASICRESP_free_d)(OCSP_BASICRESP *a);
@@ -435,6 +437,7 @@ extern int (*EC_KEY_set_public_key_d)(EC_KEY *key, const EC_POINT *pub);
 extern ASN1_STRING * (*X509_NAME_ENTRY_get_data_d)(X509_NAME_ENTRY *ne);
 extern int (*i2d_ECDSA_SIG_d)(const ECDSA_SIG *sig, unsigned char **pp);
 extern X509 * (*X509_STORE_CTX_get_current_cert_d)(X509_STORE_CTX *ctx);
+extern int (*SSL_CIPHER_get_bits_d)(const SSL_CIPHER *c, int *alg_bits);
 extern int (*i2d_OCSP_RESPONSE_d)(OCSP_RESPONSE *a, unsigned char **out);
 extern struct stack_st_X509 * (*SSL_get_peer_cert_chain_d)(const SSL *s);
 extern unsigned long (*EVP_CIPHER_CTX_flags_d)(const EVP_CIPHER_CTX *ctx);