diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-06 09:50:11 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-06 09:50:11 -0400 |
| commit | 4c03444e7c971185c20fa102eb09b707aea0d4d4 (patch) | |
| tree | c8402158f0090f45bb46b9b539d981633e509f9a /Cryptlib/OpenSSL/crypto/conf | |
| parent | 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e (diff) | |
| parent | a14921c5944c340056312f2f5b1728d698f628b1 (diff) | |
| download | efi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.tar.gz efi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.zip | |
New upstream release.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/conf')
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/conf/conf_api.c | 2 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/conf/conf_def.c | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/conf/conf_err.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/conf/conf_mall.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Cryptlib/OpenSSL/crypto/conf/conf_mod.c | 0 |
5 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 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_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 |