aboutsummaryrefslogtreecommitdiff
path: root/openssl/trunk/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/trunk/crypto')
-rw-r--r--openssl/trunk/crypto/x509v3/v3_addr.c24
-rw-r--r--openssl/trunk/crypto/x509v3/v3_asid.c12
2 files changed, 18 insertions, 18 deletions
diff --git a/openssl/trunk/crypto/x509v3/v3_addr.c b/openssl/trunk/crypto/x509v3/v3_addr.c
index 598659c7..15e5f8b5 100644
--- a/openssl/trunk/crypto/x509v3/v3_addr.c
+++ b/openssl/trunk/crypto/x509v3/v3_addr.c
@@ -695,7 +695,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
int i;
if ((addr = sk_IPAddressFamily_new(IPAddressFamily_cmp)) == NULL) {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, ERR_R_MALLOC_FAILURE);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@ -717,7 +717,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
afi = IANA_AFI_IPV6;
safi = &safi_;
} else {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_NAME_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_NAME_ERROR);
X509V3_conf_err(val);
goto err;
}
@@ -726,7 +726,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
safi = strtoul(val->value, &s, 0);
s += strspn(s, " \t");
if (safi > 0xFF || *s++ != ':') {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_VALUE_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_err(val);
goto err;
}
@@ -736,7 +736,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
if (!strcmp(s, "inherit")) {
if (addr_add_inherit(addr, afi, safi))
continue;
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_INVALID_INHERITANCE);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_INHERITANCE);
X509V3_conf_err(val);
goto err;
}
@@ -753,7 +753,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
}
if (inet_pton(af, s, min) != 1) {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_VALUE_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_err(val);
goto err;
}
@@ -766,12 +766,12 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
prefixlen = (int) strtoul(s, &s, 10);
s += strspn(s, " \t");
if (*s != '\0') {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_VALUE_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_err(val);
goto err;
}
if (!addr_add_prefix(addr, afi, safi, min, prefixlen)) {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, ERR_R_MALLOC_FAILURE);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
X509V3_conf_err(val);
goto err;
}
@@ -779,32 +779,32 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
case '-':
s += strspn(s, " \t");
if (inet_pton(af, s, max) != 1) {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_VALUE_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_err(val);
goto err;
}
s += strspn(s, addr_chars);
s += strspn(s, " \t");
if (*s != '\0') {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_VALUE_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_err(val);
goto err;
}
if (!addr_add_range(addr, afi, safi, min, max)) {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, ERR_R_MALLOC_FAILURE);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
X509V3_conf_err(val);
goto err;
}
break;
case '\0':
if (!addr_add_range(addr, afi, safi, min, min)) {
- X509V3err(X509V3_F_V2I_IPAddrBlocks, ERR_R_MALLOC_FAILURE);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
X509V3_conf_err(val);
goto err;
}
break;
default:
- X509V3err(X509V3_F_V2I_IPAddrBlocks, X509V3_R_EXTENSION_VALUE_ERROR);
+ X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
X509V3_conf_err(val);
goto err;
}
diff --git a/openssl/trunk/crypto/x509v3/v3_asid.c b/openssl/trunk/crypto/x509v3/v3_asid.c
index f0eab56b..2d71b350 100644
--- a/openssl/trunk/crypto/x509v3/v3_asid.c
+++ b/openssl/trunk/crypto/x509v3/v3_asid.c
@@ -305,7 +305,7 @@ static void *v2i_ASIdentifiers(struct v3_ext_method *method,
int i;
if ((asid = ASIdentifiers_new()) == NULL) {
- X509V3err(X509V3_F_V2I_ASIdentifiers, ERR_R_MALLOC_FAILURE);
+ X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@ -320,7 +320,7 @@ static void *v2i_ASIdentifiers(struct v3_ext_method *method,
} else if (!strcmp(val->name, "rdi")) {
choice = &asid->rdi;
} else {
- X509V3err(X509V3_F_V2I_ASIdentifiers, X509V3_R_EXTENSION_NAME_ERROR);
+ X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_EXTENSION_NAME_ERROR);
X509V3_conf_err(val);
goto err;
}
@@ -331,7 +331,7 @@ static void *v2i_ASIdentifiers(struct v3_ext_method *method,
if (!strcmp(val->value, "inherit")) {
if (asid_add_inherit(choice))
continue;
- X509V3err(X509V3_F_V2I_ASIdentifiers, X509V3_R_INVALID_INHERITANCE);
+ X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_INHERITANCE);
X509V3_conf_err(val);
goto err;
}
@@ -340,19 +340,19 @@ static void *v2i_ASIdentifiers(struct v3_ext_method *method,
* Number or range. Add it to the list, we'll sort the list later.
*/
if (!X509V3_get_value_int(val, &min)) {
- X509V3err(X509V3_F_V2I_ASIdentifiers, X509V3_R_INVALID_ASNUMBER);
+ X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASNUMBER);
X509V3_conf_err(val);
goto err;
}
if ((s = strchr(val->value, '-')) == NULL) {
max = NULL;
} else if ((max = s2i_ASN1_INTEGER(NULL, s + strspn(s, "- \t"))) == NULL) {
- X509V3err(X509V3_F_V2I_ASIdentifiers, X509V3_R_INVALID_ASRANGE);
+ X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASRANGE);
X509V3_conf_err(val);
goto err;
}
if (!asid_add_id_or_range(choice, min, max)) {
- X509V3err(X509V3_F_V2I_ASIdentifiers, ERR_R_MALLOC_FAILURE);
+ X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
goto err;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 16:52:23 +0000