diff options
author | Adam Langley <agl@google.com> | 2015-05-11 17:20:37 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2015-05-12 23:06:14 +0000 |
commit | e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5 (patch) | |
tree | 6e43e34595ecf887c26c32b86d8ab097fe8cac64 /src/include/openssl/pkcs8.h | |
parent | b3106a0cc1493bbe0505c0ec0ce3da4ca90a29ae (diff) | |
download | external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.gz external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.bz2 external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.zip |
external/boringssl: bump revision.
This change bumps the BoringSSL revision to the current tip-of-tree.
Change-Id: I91d5bf467e16e8d86cb19a4de873985f524e5faa
Diffstat (limited to 'src/include/openssl/pkcs8.h')
-rw-r--r-- | src/include/openssl/pkcs8.h | 88 |
1 files changed, 41 insertions, 47 deletions
diff --git a/src/include/openssl/pkcs8.h b/src/include/openssl/pkcs8.h index 826ac7f..8dc7731 100644 --- a/src/include/openssl/pkcs8.h +++ b/src/include/openssl/pkcs8.h @@ -58,11 +58,9 @@ #define OPENSSL_HEADER_PKCS8_H #include <openssl/base.h> - -#include <stdio.h> - #include <openssl/x509.h> + #if defined(__cplusplus) extern "C" { #endif @@ -172,52 +170,48 @@ OPENSSL_EXPORT void PKCS12_free(PKCS12 *p12); } /* extern C */ #endif -#define PKCS8_F_PKCS8_encrypt 100 +#define PKCS8_F_EVP_PKCS82PKEY 100 #define PKCS8_F_EVP_PKEY2PKCS8 101 -#define PKCS8_F_EVP_PKCS82PKEY 102 -#define PKCS8_F_PKCS5_pbe_set0_algor 103 -#define PKCS8_F_pbe_crypt 104 -#define PKCS8_F_pkcs12_item_decrypt_d2i 105 +#define PKCS8_F_PKCS12_get_key_and_certs 102 +#define PKCS8_F_PKCS12_handle_content_info 103 +#define PKCS8_F_PKCS12_handle_content_infos 104 +#define PKCS8_F_PKCS5_pbe2_set_iv 105 #define PKCS8_F_PKCS5_pbe_set 106 -#define PKCS8_F_pkcs12_key_gen_uni 107 -#define PKCS8_F_pkcs12_key_gen_asc 108 -#define PKCS8_F_pkcs12_pbe_keyivgen 109 -#define PKCS8_F_pbe_cipher_init 110 -#define PKCS8_F_pkcs12_item_i2d_encrypt 111 -#define PKCS8_F_PKCS5_pbe2_set_iv 112 -#define PKCS8_F_PKCS5_pbkdf2_set 113 -#define PKCS8_F_pkcs12_key_gen_raw 114 -#define PKCS8_F_PKCS8_decrypt 115 -#define PKCS8_F_PKCS8_encrypt_pbe 116 -#define PKCS8_F_PKCS12_parse 117 -#define PKCS8_F_PKCS12_handle_content_info 118 -#define PKCS8_F_PKCS12_handle_content_infos 119 -#define PKCS8_F_PKCS12_get_key_and_certs 120 -#define PKCS8_R_ERROR_SETTING_CIPHER_PARAMS 100 -#define PKCS8_R_PRIVATE_KEY_ENCODE_ERROR 101 -#define PKCS8_R_UNKNOWN_ALGORITHM 102 -#define PKCS8_R_UNKNOWN_CIPHER 103 -#define PKCS8_R_UNKNOWN_DIGEST 104 +#define PKCS8_F_PKCS5_pbe_set0_algor 107 +#define PKCS8_F_PKCS5_pbkdf2_set 108 +#define PKCS8_F_PKCS8_decrypt 109 +#define PKCS8_F_PKCS8_encrypt 110 +#define PKCS8_F_PKCS8_encrypt_pbe 111 +#define PKCS8_F_pbe_cipher_init 112 +#define PKCS8_F_pbe_crypt 113 +#define PKCS8_F_pkcs12_item_decrypt_d2i 114 +#define PKCS8_F_pkcs12_item_i2d_encrypt 115 +#define PKCS8_F_pkcs12_key_gen_raw 116 +#define PKCS8_F_pkcs12_pbe_keyivgen 117 +#define PKCS8_R_BAD_PKCS12_DATA 100 +#define PKCS8_R_BAD_PKCS12_VERSION 101 +#define PKCS8_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER 102 +#define PKCS8_R_CRYPT_ERROR 103 +#define PKCS8_R_DECODE_ERROR 104 #define PKCS8_R_ENCODE_ERROR 105 -#define PKCS8_R_DECODE_ERROR 106 -#define PKCS8_R_ENCRYPT_ERROR 107 -#define PKCS8_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 108 -#define PKCS8_R_PRIVATE_KEY_DECODE_ERROR 109 -#define PKCS8_R_UNKNOWN_CIPHER_ALGORITHM 110 -#define PKCS8_R_KEYGEN_FAILURE 111 -#define PKCS8_R_TOO_LONG 112 -#define PKCS8_R_CRYPT_ERROR 113 -#define PKCS8_R_METHOD_NOT_SUPPORTED 114 -#define PKCS8_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER 115 -#define PKCS8_R_KEY_GEN_ERROR 116 -#define PKCS8_R_BAD_PKCS12_DATA 117 -#define PKCS8_R_PKCS12_PUBLIC_KEY_INTEGRITY_NOT_SUPPORTED 118 -#define PKCS8_R_BAD_PKCS12_VERSION 119 -#define PKCS8_R_PKCS12_TOO_DEEPLY_NESTED 120 -#define PKCS8_R_MULTIPLE_PRIVATE_KEYS_IN_PKCS12 121 -#define PKCS8_R_UNKNOWN_HASH 122 -#define PKCS8_R_BAD_MAC 123 -#define PKCS8_R_MISSING_MAC 124 -#define PKCS8_R_INCORRECT_PASSWORD 125 +#define PKCS8_R_ENCRYPT_ERROR 106 +#define PKCS8_R_ERROR_SETTING_CIPHER_PARAMS 107 +#define PKCS8_R_INCORRECT_PASSWORD 108 +#define PKCS8_R_KEYGEN_FAILURE 109 +#define PKCS8_R_KEY_GEN_ERROR 110 +#define PKCS8_R_METHOD_NOT_SUPPORTED 111 +#define PKCS8_R_MISSING_MAC 112 +#define PKCS8_R_MULTIPLE_PRIVATE_KEYS_IN_PKCS12 113 +#define PKCS8_R_PKCS12_PUBLIC_KEY_INTEGRITY_NOT_SUPPORTED 114 +#define PKCS8_R_PKCS12_TOO_DEEPLY_NESTED 115 +#define PKCS8_R_PRIVATE_KEY_DECODE_ERROR 116 +#define PKCS8_R_PRIVATE_KEY_ENCODE_ERROR 117 +#define PKCS8_R_TOO_LONG 118 +#define PKCS8_R_UNKNOWN_ALGORITHM 119 +#define PKCS8_R_UNKNOWN_CIPHER 120 +#define PKCS8_R_UNKNOWN_CIPHER_ALGORITHM 121 +#define PKCS8_R_UNKNOWN_DIGEST 122 +#define PKCS8_R_UNKNOWN_HASH 123 +#define PKCS8_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 124 #endif /* OPENSSL_HEADER_PKCS8_H */ |