diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-02-11 01:16:07 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-06-29 11:55:31 +0200 |
| commit | a09003ea22fd99511cc0153314c8751a84d95496 (patch) | |
| tree | 2e078852c2ba40927e36f1f7bf84c79d9a62af99 /include/openssl/storeerr.h | |
| parent | e61ec2d9babf30da3a4d94554e576bf10c1fc92c (diff) | |
| download | openssl-new-a09003ea22fd99511cc0153314c8751a84d95496.tar.gz | |
STORE 'file' scheme loader: add support for the PKCS#12 container
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3542)
Diffstat (limited to 'include/openssl/storeerr.h')
| -rw-r--r-- | include/openssl/storeerr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h index 7782a6f717..1458574caa 100644 --- a/include/openssl/storeerr.h +++ b/include/openssl/storeerr.h @@ -45,11 +45,13 @@ int ERR_load_OSSL_STORE_strings(void); # define OSSL_STORE_F_OSSL_STORE_REGISTER_LOADER_INT 117 # define OSSL_STORE_F_OSSL_STORE_UNREGISTER_LOADER_INT 116 # define OSSL_STORE_F_TRY_DECODE_PARAMS 121 +# define OSSL_STORE_F_TRY_DECODE_PKCS12 122 /* * OSSL_STORE reason codes. */ # define OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE 107 +# define OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC 113 # define OSSL_STORE_R_INVALID_SCHEME 106 # define OSSL_STORE_R_IS_NOT_A 112 # define OSSL_STORE_R_NOT_A_CERTIFICATE 100 @@ -57,6 +59,7 @@ int ERR_load_OSSL_STORE_strings(void); # define OSSL_STORE_R_NOT_A_KEY 102 # define OSSL_STORE_R_NOT_A_NAME 103 # define OSSL_STORE_R_NOT_PARAMETERS 104 +# define OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR 114 # define OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE 108 # define OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED 109 # define OSSL_STORE_R_UNREGISTERED_SCHEME 105 |