Skip to content

Commit 1ac658a

Browse files
committed
Rename misleading X509V3_R_INVALID_NULL_NAME to X509V3_R_INVALID_EMPTY_NAME
Reviewed-by: Paul Dale <[email protected]> (Merged from openssl#12296)
1 parent c90c469 commit 1ac658a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

crypto/err/openssl.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3471,7 +3471,7 @@ X509V3_R_INVALID_IPADDRESS:166:invalid ipaddress
34713471
X509V3_R_INVALID_MULTIPLE_RDNS:161:invalid multiple rdns
34723472
X509V3_R_INVALID_NAME:106:invalid name
34733473
X509V3_R_INVALID_NULL_ARGUMENT:107:invalid null argument
3474-
X509V3_R_INVALID_NULL_NAME:108:invalid null name
3474+
X509V3_R_INVALID_EMPTY_NAME:108:invalid empty name
34753475
X509V3_R_INVALID_NULL_VALUE:109:invalid null value
34763476
X509V3_R_INVALID_NUMBER:140:invalid number
34773477
X509V3_R_INVALID_NUMBERS:141:invalid numbers

crypto/x509/v3_utl.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
323323
ntmp = strip_spaces(q);
324324
if (!ntmp) {
325325
X509V3err(X509V3_F_X509V3_PARSE_LIST,
326-
X509V3_R_INVALID_NULL_NAME);
326+
X509V3_R_INVALID_EMPTY_NAME);
327327
goto err;
328328
}
329329
q = p + 1;
@@ -333,7 +333,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
333333
q = p + 1;
334334
if (!ntmp) {
335335
X509V3err(X509V3_F_X509V3_PARSE_LIST,
336-
X509V3_R_INVALID_NULL_NAME);
336+
X509V3_R_INVALID_EMPTY_NAME);
337337
goto err;
338338
}
339339
X509V3_add_value(ntmp, NULL, &values);
@@ -369,7 +369,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
369369
} else {
370370
ntmp = strip_spaces(q);
371371
if (!ntmp) {
372-
X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME);
372+
X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_EMPTY_NAME);
373373
goto err;
374374
}
375375
X509V3_add_value(ntmp, NULL, &values);

crypto/x509/v3err.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = {
6262
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name"},
6363
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT),
6464
"invalid null argument"},
65-
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_NAME),
66-
"invalid null name"},
65+
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
66+
"invalid empty name"},
6767
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE),
6868
"invalid null value"},
6969
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number"},

include/openssl/x509v3err.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ int ERR_load_X509V3_strings(void);
127127
# define X509V3_R_INVALID_MULTIPLE_RDNS 161
128128
# define X509V3_R_INVALID_NAME 106
129129
# define X509V3_R_INVALID_NULL_ARGUMENT 107
130-
# define X509V3_R_INVALID_NULL_NAME 108
130+
# define X509V3_R_INVALID_EMPTY_NAME 108
131131
# define X509V3_R_INVALID_NULL_VALUE 109
132132
# define X509V3_R_INVALID_NUMBER 140
133133
# define X509V3_R_INVALID_NUMBERS 141

0 commit comments

Comments
 (0)