diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-02-11 01:18:29 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-06-29 11:55:32 +0200 |
| commit | 7ad2ef366c3e96747dabee232a10b33d8fd2262a (patch) | |
| tree | 23951db778a3e5fbcafb5e5e8362715ef357b9bc /include | |
| parent | STORE 'file' scheme loader: refactor file_load to support decoding restart (diff) | |
| download | openssl-7ad2ef366c3e96747dabee232a10b33d8fd2262a.tar.xz openssl-7ad2ef366c3e96747dabee232a10b33d8fd2262a.zip | |
STORE 'file' scheme loader: Add handler for encrypted PKCS#8 data
Add a separate handler for encrypted PKCS#8 data. This uses the new
restart functionality.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3542)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/storeerr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h index c37e4170a9..659355a3d6 100644 --- a/include/openssl/storeerr.h +++ b/include/openssl/storeerr.h @@ -48,11 +48,13 @@ int ERR_load_OSSL_STORE_strings(void); # 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 +# define OSSL_STORE_F_TRY_DECODE_PKCS8ENCRYPTED 125 /* * OSSL_STORE reason codes. */ # define OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE 107 +# define OSSL_STORE_R_BAD_PASSWORD_READ 115 # define OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC 113 # define OSSL_STORE_R_INVALID_SCHEME 106 # define OSSL_STORE_R_IS_NOT_A 112 |