diff options
| author | Adam Langley <agl@google.com> | 2015-09-24 10:57:52 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-09-24 11:04:03 -0700 |
| commit | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/crypto/err/pem.errordata | |
| parent | 08656b61d075740bfb24ddcce65223146259fc02 (diff) | |
| download | external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.zip external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.gz external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.bz2 | |
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
Diffstat (limited to 'src/crypto/err/pem.errordata')
| -rw-r--r-- | src/crypto/err/pem.errordata | 54 |
1 files changed, 15 insertions, 39 deletions
diff --git a/src/crypto/err/pem.errordata b/src/crypto/err/pem.errordata index 42216a7..2a4b73a 100644 --- a/src/crypto/err/pem.errordata +++ b/src/crypto/err/pem.errordata @@ -1,39 +1,15 @@ -PEM,function,100,PEM_ASN1_read -PEM,function,101,PEM_ASN1_read_bio -PEM,function,102,PEM_ASN1_write -PEM,function,103,PEM_ASN1_write_bio -PEM,function,104,PEM_X509_INFO_read -PEM,function,105,PEM_X509_INFO_read_bio -PEM,function,106,PEM_X509_INFO_write_bio -PEM,function,107,PEM_do_header -PEM,function,108,PEM_get_EVP_CIPHER_INFO -PEM,function,109,PEM_read -PEM,function,110,PEM_read_DHparams -PEM,function,111,PEM_read_PrivateKey -PEM,function,112,PEM_read_bio -PEM,function,113,PEM_read_bio_DHparams -PEM,function,114,PEM_read_bio_Parameters -PEM,function,115,PEM_read_bio_PrivateKey -PEM,function,116,PEM_write -PEM,function,117,PEM_write_PrivateKey -PEM,function,118,PEM_write_bio -PEM,function,119,d2i_PKCS8PrivateKey_bio -PEM,function,120,d2i_PKCS8PrivateKey_fp -PEM,function,121,do_pk8pkey -PEM,function,122,do_pk8pkey_fp -PEM,function,123,load_iv -PEM,reason,100,BAD_BASE64_DECODE -PEM,reason,101,BAD_DECRYPT -PEM,reason,102,BAD_END_LINE -PEM,reason,103,BAD_IV_CHARS -PEM,reason,104,BAD_PASSWORD_READ -PEM,reason,105,CIPHER_IS_NULL -PEM,reason,106,ERROR_CONVERTING_PRIVATE_KEY -PEM,reason,107,NOT_DEK_INFO -PEM,reason,108,NOT_ENCRYPTED -PEM,reason,109,NOT_PROC_TYPE -PEM,reason,110,NO_START_LINE -PEM,reason,111,READ_KEY -PEM,reason,112,SHORT_HEADER -PEM,reason,113,UNSUPPORTED_CIPHER -PEM,reason,114,UNSUPPORTED_ENCRYPTION +PEM,100,BAD_BASE64_DECODE +PEM,101,BAD_DECRYPT +PEM,102,BAD_END_LINE +PEM,103,BAD_IV_CHARS +PEM,104,BAD_PASSWORD_READ +PEM,105,CIPHER_IS_NULL +PEM,106,ERROR_CONVERTING_PRIVATE_KEY +PEM,107,NOT_DEK_INFO +PEM,108,NOT_ENCRYPTED +PEM,109,NOT_PROC_TYPE +PEM,110,NO_START_LINE +PEM,111,READ_KEY +PEM,112,SHORT_HEADER +PEM,113,UNSUPPORTED_CIPHER +PEM,114,UNSUPPORTED_ENCRYPTION |