diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-06-26 20:13:47 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-04 09:17:47 +0200 |
| commit | 1ac658ac9d40711d0a9610e932ddfa7b90fdc537 (patch) | |
| tree | b8f9ba0a35cb1c425bf7f7d8eefcece2a8a0b6cc | |
| parent | c90c469376e28e87caf02e96bf6568131f1c5d1b (diff) | |
Rename misleading X509V3_R_INVALID_NULL_NAME to X509V3_R_INVALID_EMPTY_NAME
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12296)
| -rw-r--r-- | crypto/err/openssl.txt | 2 | ||||
| -rw-r--r-- | crypto/x509/v3_utl.c | 6 | ||||
| -rw-r--r-- | crypto/x509/v3err.c | 4 | ||||
| -rw-r--r-- | include/openssl/x509v3err.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 1fa0df36b1..53becb8ed4 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -3471,7 +3471,7 @@ X509V3_R_INVALID_IPADDRESS:166:invalid ipaddress X509V3_R_INVALID_MULTIPLE_RDNS:161:invalid multiple rdns X509V3_R_INVALID_NAME:106:invalid name X509V3_R_INVALID_NULL_ARGUMENT:107:invalid null argument -X509V3_R_INVALID_NULL_NAME:108:invalid null name +X509V3_R_INVALID_EMPTY_NAME:108:invalid empty name X509V3_R_INVALID_NULL_VALUE:109:invalid null value X509V3_R_INVALID_NUMBER:140:invalid number X509V3_R_INVALID_NUMBERS:141:invalid numbers diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c index 5f641b9d43..acb0e35a42 100644 --- a/crypto/x509/v3_utl.c +++ b/crypto/x509/v3_utl.c @@ -323,7 +323,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line) ntmp = strip_spaces(q); if (!ntmp) { X509V3err(X509V3_F_X509V3_PARSE_LIST, - X509V3_R_INVALID_NULL_NAME); + X509V3_R_INVALID_EMPTY_NAME); goto err; } q = p + 1; @@ -333,7 +333,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line) q = p + 1; if (!ntmp) { X509V3err(X509V3_F_X509V3_PARSE_LIST, - X509V3_R_INVALID_NULL_NAME); + X509V3_R_INVALID_EMPTY_NAME); goto err; } X509V3_add_value(ntmp, NULL, &values); @@ -369,7 +369,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line) } else { ntmp = strip_spaces(q); if (!ntmp) { - X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME); + X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_EMPTY_NAME); goto err; } X509V3_add_value(ntmp, NULL, &values); diff --git a/crypto/x509/v3err.c b/crypto/x509/v3err.c index cbda3f2cf8..91fe0d075a 100644 --- a/crypto/x509/v3err.c +++ b/crypto/x509/v3err.c @@ -62,8 +62,8 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = { {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name"}, {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT), "invalid null argument"}, - {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_NAME), - "invalid null name"}, + {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME), + "invalid empty name"}, {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE), "invalid null value"}, {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number"}, diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h index eb3593fa20..d7aa5da6ac 100644 --- a/include/openssl/x509v3err.h +++ b/include/openssl/x509v3err.h @@ -127,7 +127,7 @@ int ERR_load_X509V3_strings(void); # define X509V3_R_INVALID_MULTIPLE_RDNS 161 # define X509V3_R_INVALID_NAME 106 # define X509V3_R_INVALID_NULL_ARGUMENT 107 -# define X509V3_R_INVALID_NULL_NAME 108 +# define X509V3_R_INVALID_EMPTY_NAME 108 # define X509V3_R_INVALID_NULL_VALUE 109 # define X509V3_R_INVALID_NUMBER 140 # define X509V3_R_INVALID_NUMBERS 141 |