summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/conf
diff options
context:
space:
mode:
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/conf')
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_api.c2
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_def.c2
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_err.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_lib.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_mall.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_mod.c0
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/conf/conf_sap.c0
7 files changed, 2 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_api.c b/Cryptlib/OpenSSL/crypto/conf/conf_api.c
index 17bae835..55d1d506 100755..100644
--- 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
index 3c58936d..a168339b 100755..100644
--- 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
index a16a5e0b..a16a5e0b 100755..100644
--- a/Cryptlib/OpenSSL/crypto/conf/conf_err.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_err.c
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c
index 2a3399d2..2a3399d2 100755..100644
--- a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_mall.c b/Cryptlib/OpenSSL/crypto/conf/conf_mall.c
index 1cc1fd55..1cc1fd55 100755..100644
--- a/Cryptlib/OpenSSL/crypto/conf/conf_mall.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_mall.c
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_mod.c b/Cryptlib/OpenSSL/crypto/conf/conf_mod.c
index ee9c677d..ee9c677d 100755..100644
--- a/Cryptlib/OpenSSL/crypto/conf/conf_mod.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_mod.c
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
index 760dc263..760dc263 100755..100644
--- a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c