diff options
author | Kurt Roeckx <kurt@roeckx.be> | 2015-01-24 15:04:53 +0100 |
---|---|---|
committer | Kurt Roeckx <kurt@roeckx.be> | 2015-01-24 15:04:53 +0100 |
commit | 184693f4af2846dd89f473482e55df26c428da36 (patch) | |
tree | 8ada0ffd43d6eeab43f6b01486b22b88b68c9d17 | |
parent | 925bfca5d347d10f1a2e172be001090ae7ebafc2 (diff) | |
download | openssl-new-184693f4af2846dd89f473482e55df26c428da36.tar.gz |
Fix segfault with empty fields as last in the config.
Reviewed-by: Tim Hudson <tjh@openssl.org>
-rw-r--r-- | crypto/asn1/asn1_gen.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_fat.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index 132a9ef468..aaec009f22 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -279,6 +279,9 @@ static int asn1_cb(const char *elem, int len, void *bitstr) int tmp_tag, tmp_class; + if (elem == NULL) + return 0; + for (i = 0, p = elem; i < len; p++, i++) { /* Look for the ':' in name value pairs */ if (*p == ':') { diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index bcb4c446b2..4279dd94b1 100644 --- a/crypto/engine/eng_fat.c +++ b/crypto/engine/eng_fat.c @@ -103,6 +103,8 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags) static int int_def_cb(const char *alg, int len, void *arg) { unsigned int *pflags = arg; + if (alg == NULL) + return 0; if (!strncmp(alg, "ALL", len)) *pflags |= ENGINE_METHOD_ALL; else if (!strncmp(alg, "RSA", len)) |