From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- src/crypto/err/pkcs8.errordata | 68 ++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 43 deletions(-) (limited to 'src/crypto/err/pkcs8.errordata') diff --git a/src/crypto/err/pkcs8.errordata b/src/crypto/err/pkcs8.errordata index 936f3c5..0eb5083 100644 --- a/src/crypto/err/pkcs8.errordata +++ b/src/crypto/err/pkcs8.errordata @@ -1,43 +1,25 @@ -PKCS8,function,100,EVP_PKCS82PKEY -PKCS8,function,101,EVP_PKEY2PKCS8 -PKCS8,function,102,PKCS12_get_key_and_certs -PKCS8,function,103,PKCS12_handle_content_info -PKCS8,function,104,PKCS12_handle_content_infos -PKCS8,function,105,PKCS5_pbe2_set_iv -PKCS8,function,106,PKCS5_pbe_set -PKCS8,function,107,PKCS5_pbe_set0_algor -PKCS8,function,108,PKCS5_pbkdf2_set -PKCS8,function,109,PKCS8_decrypt -PKCS8,function,110,PKCS8_encrypt -PKCS8,function,111,PKCS8_encrypt_pbe -PKCS8,function,112,pbe_cipher_init -PKCS8,function,113,pbe_crypt -PKCS8,function,114,pkcs12_item_decrypt_d2i -PKCS8,function,115,pkcs12_item_i2d_encrypt -PKCS8,function,116,pkcs12_key_gen_raw -PKCS8,function,117,pkcs12_pbe_keyivgen -PKCS8,reason,100,BAD_PKCS12_DATA -PKCS8,reason,101,BAD_PKCS12_VERSION -PKCS8,reason,102,CIPHER_HAS_NO_OBJECT_IDENTIFIER -PKCS8,reason,103,CRYPT_ERROR -PKCS8,reason,104,DECODE_ERROR -PKCS8,reason,105,ENCODE_ERROR -PKCS8,reason,106,ENCRYPT_ERROR -PKCS8,reason,107,ERROR_SETTING_CIPHER_PARAMS -PKCS8,reason,108,INCORRECT_PASSWORD -PKCS8,reason,109,KEYGEN_FAILURE -PKCS8,reason,110,KEY_GEN_ERROR -PKCS8,reason,111,METHOD_NOT_SUPPORTED -PKCS8,reason,112,MISSING_MAC -PKCS8,reason,113,MULTIPLE_PRIVATE_KEYS_IN_PKCS12 -PKCS8,reason,114,PKCS12_PUBLIC_KEY_INTEGRITY_NOT_SUPPORTED -PKCS8,reason,115,PKCS12_TOO_DEEPLY_NESTED -PKCS8,reason,116,PRIVATE_KEY_DECODE_ERROR -PKCS8,reason,117,PRIVATE_KEY_ENCODE_ERROR -PKCS8,reason,118,TOO_LONG -PKCS8,reason,119,UNKNOWN_ALGORITHM -PKCS8,reason,120,UNKNOWN_CIPHER -PKCS8,reason,121,UNKNOWN_CIPHER_ALGORITHM -PKCS8,reason,122,UNKNOWN_DIGEST -PKCS8,reason,123,UNKNOWN_HASH -PKCS8,reason,124,UNSUPPORTED_PRIVATE_KEY_ALGORITHM +PKCS8,100,BAD_PKCS12_DATA +PKCS8,101,BAD_PKCS12_VERSION +PKCS8,102,CIPHER_HAS_NO_OBJECT_IDENTIFIER +PKCS8,103,CRYPT_ERROR +PKCS8,104,DECODE_ERROR +PKCS8,105,ENCODE_ERROR +PKCS8,106,ENCRYPT_ERROR +PKCS8,107,ERROR_SETTING_CIPHER_PARAMS +PKCS8,108,INCORRECT_PASSWORD +PKCS8,109,KEYGEN_FAILURE +PKCS8,110,KEY_GEN_ERROR +PKCS8,111,METHOD_NOT_SUPPORTED +PKCS8,112,MISSING_MAC +PKCS8,113,MULTIPLE_PRIVATE_KEYS_IN_PKCS12 +PKCS8,114,PKCS12_PUBLIC_KEY_INTEGRITY_NOT_SUPPORTED +PKCS8,115,PKCS12_TOO_DEEPLY_NESTED +PKCS8,116,PRIVATE_KEY_DECODE_ERROR +PKCS8,117,PRIVATE_KEY_ENCODE_ERROR +PKCS8,118,TOO_LONG +PKCS8,119,UNKNOWN_ALGORITHM +PKCS8,120,UNKNOWN_CIPHER +PKCS8,121,UNKNOWN_CIPHER_ALGORITHM +PKCS8,122,UNKNOWN_DIGEST +PKCS8,123,UNKNOWN_HASH +PKCS8,124,UNSUPPORTED_PRIVATE_KEY_ALGORITHM -- cgit v1.1