diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-03-27 17:03:01 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-03-27 17:03:01 +0000 |
| commit | 02be298e504b8554caca6dc85af450e1ea44d19d (patch) | |
| tree | b4870fcd2c2663fedd44997d4bb5ad13dcd50293 /crypto/x509v3/v3_conf.c | |
| parent | 4f94f84d8491a2455678402b5c7c92e692a272bc (diff) | |
| download | src-02be298e504b8554caca6dc85af450e1ea44d19d.tar.gz src-02be298e504b8554caca6dc85af450e1ea44d19d.zip | |
Import OpenSSL 1.0.2o.vendor/openssl/1.0.2o
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=331625
svn path=/vendor-crypto/openssl/1.0.2o/; revision=331626; tag=vendor/openssl/1.0.2o
Diffstat (limited to 'crypto/x509v3/v3_conf.c')
| -rw-r--r-- | crypto/x509v3/v3_conf.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index c1b4c1a89f74..a38848cc1df7 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -4,7 +4,7 @@ * 1999. */ /* ==================================================================== - * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2018 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -340,8 +340,12 @@ int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section, val = sk_CONF_VALUE_value(nval, i); if (!(ext = X509V3_EXT_nconf(conf, ctx, val->name, val->value))) return 0; - if (sk) - X509v3_add_ext(sk, ext, -1); + if (sk != NULL) { + if (X509v3_add_ext(sk, ext, -1) == NULL) { + X509_EXTENSION_free(ext); + return 0; + } + } X509_EXTENSION_free(ext); } return 1; |