From ba476aa32c2de4c652f2fdb148981f7d1ea6cae1 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 11 Jul 2017 11:46:14 +0200 Subject: [PATCH 1/1] OSSL_STORE: spell error reason correctly Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/3907) --- crypto/err/openssl.txt | 2 +- crypto/store/loader_file.c | 2 +- crypto/store/store_err.c | 4 ++-- include/openssl/storeerr.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 04f48a5a10..f8428706d2 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2004,7 +2004,7 @@ OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED:109:\ ui process interrupted or cancelled OSSL_STORE_R_UNREGISTERED_SCHEME:105:unregistered scheme OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE:110:unsupported content type -OSSL_STORE_R_URI_AUTHORITY_UNSUPPORED:111:uri authority unsuppored +OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED:111:uri authority unsupported PEM_R_BAD_BASE64_DECODE:100:bad base64 decode PEM_R_BAD_DECRYPT:101:bad decrypt PEM_R_BAD_END_LINE:102:bad end line diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c index 06094bf274..85ab2b4206 100644 --- a/crypto/store/loader_file.c +++ b/crypto/store/loader_file.c @@ -755,7 +755,7 @@ static OSSL_STORE_LOADER_CTX *file_open(const OSSL_STORE_LOADER *loader, path = &uri[5]; } else { OSSL_STOREerr(OSSL_STORE_F_FILE_OPEN, - OSSL_STORE_R_URI_AUTHORITY_UNSUPPORED); + OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED); return NULL; } diff --git a/crypto/store/store_err.c b/crypto/store/store_err.c index 86a15c9a97..c78b3899f7 100644 --- a/crypto/store/store_err.c +++ b/crypto/store/store_err.c @@ -104,8 +104,8 @@ static const ERR_STRING_DATA OSSL_STORE_str_reasons[] = { "unregistered scheme"}, {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE), "unsupported content type"}, - {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_URI_AUTHORITY_UNSUPPORED), - "uri authority unsuppored"}, + {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED), + "uri authority unsupported"}, {0, NULL} }; diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h index b1d23de64a..cffe8dea18 100644 --- a/include/openssl/storeerr.h +++ b/include/openssl/storeerr.h @@ -73,6 +73,6 @@ int ERR_load_OSSL_STORE_strings(void); # define OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED 109 # define OSSL_STORE_R_UNREGISTERED_SCHEME 105 # define OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE 110 -# define OSSL_STORE_R_URI_AUTHORITY_UNSUPPORED 111 +# define OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED 111 #endif -- 2.34.1