diff options
Diffstat (limited to 'crypto/x509/v3_addr.c')
-rw-r--r-- | crypto/x509/v3_addr.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c index 9e2b9d48a9..d965d74553 100644 --- a/crypto/x509/v3_addr.c +++ b/crypto/x509/v3_addr.c @@ -22,6 +22,7 @@ #include <openssl/x509v3.h> #include "crypto/x509.h" #include "ext_dat.h" +#include "x509_local.h" #ifndef OPENSSL_NO_RFC3779 @@ -925,7 +926,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, } else { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_NAME_ERROR); - X509V3_conf_err(val); + ERR_add_error_data(1, val->name); goto err; } @@ -949,7 +950,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, t += strspn(t, " \t"); if (*safi > 0xFF || *t++ != ':') { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_SAFI); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } t += strspn(t, " \t"); @@ -970,7 +971,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, if (!X509v3_addr_add_inherit(addr, afi, safi)) { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_INHERITANCE); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } OPENSSL_free(s); @@ -985,7 +986,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, if (a2i_ipadd(min, s) != length) { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } @@ -995,7 +996,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, if (t == s + i2 || *t != '\0') { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } if (!X509v3_addr_add_prefix(addr, afi, safi, min, prefixlen)) { @@ -1009,19 +1010,19 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, if (i1 == i2 || s[i2] != '\0') { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } if (a2i_ipadd(max, s + i1) != length) { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } if (memcmp(min, max, length_from_afi(afi)) > 0) { X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } if (!X509v3_addr_add_range(addr, afi, safi, min, max)) { @@ -1038,7 +1039,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, default: X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR); - X509V3_conf_err(val); + X509V3_conf_add_error_name_value(val); goto err; } |