From 5cbe75a3facfe8256454595ca3abbff7ad6076b0 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 19 Aug 2014 14:20:23 -0400 Subject: Update openssl to 0.9.8zb Also update to Tiano Cryptlib r15802 and remove the execute mode bits from the C and header files of openssl --- Cryptlib/OpenSSL/crypto/conf/conf_api.c | 2 +- Cryptlib/OpenSSL/crypto/conf/conf_def.c | 2 +- Cryptlib/OpenSSL/crypto/conf/conf_err.c | 0 Cryptlib/OpenSSL/crypto/conf/conf_lib.c | 0 Cryptlib/OpenSSL/crypto/conf/conf_mall.c | 0 Cryptlib/OpenSSL/crypto/conf/conf_mod.c | 0 Cryptlib/OpenSSL/crypto/conf/conf_sap.c | 0 7 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_api.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_def.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_err.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_lib.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_mall.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_mod.c mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_sap.c (limited to 'Cryptlib/OpenSSL/crypto/conf') diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_api.c b/Cryptlib/OpenSSL/crypto/conf/conf_api.c old mode 100755 new mode 100644 index 17bae835..55d1d506 --- a/Cryptlib/OpenSSL/crypto/conf/conf_api.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_api.c @@ -294,7 +294,7 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section) v->value=(char *)sk; vv=(CONF_VALUE *)lh_insert(conf->data,v); - assert(vv == NULL); + OPENSSL_assert(vv == NULL); ok=1; err: if (!ok) diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_def.c b/Cryptlib/OpenSSL/crypto/conf/conf_def.c old mode 100755 new mode 100644 index 3c58936d..a168339b --- a/Cryptlib/OpenSSL/crypto/conf/conf_def.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_def.c @@ -324,7 +324,7 @@ again: p=eat_ws(conf, end); if (*p != ']') { - if (*p != '\0') + if (*p != '\0' && ss != p) { ss=p; goto again; diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_err.c b/Cryptlib/OpenSSL/crypto/conf/conf_err.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_mall.c b/Cryptlib/OpenSSL/crypto/conf/conf_mall.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_mod.c b/Cryptlib/OpenSSL/crypto/conf/conf_mod.c old mode 100755 new mode 100644 diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c old mode 100755 new mode 100644 -- cgit v1.2.3