diff options
| author | Adam Langley <agl@google.com> | 2015-04-28 13:20:52 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-05-09 14:27:34 +0000 |
| commit | c3326552d973ce34f0f3138333a05a4a1865a699 (patch) | |
| tree | eb902c6de30274baf88e9307cc2463aed426c7e6 /openssl_err.cpp | |
| parent | 31e063f8ed913369eb30648537fb5827dfd7a0d3 (diff) | |
| download | keymaster-c3326552d973ce34f0f3138333a05a4a1865a699.tar.gz | |
keymaster: support building with tip-of-tree BoringSSL.
Change-Id: Ie9bcbcb33f7904fbffef9dee4f5b4203b1d8f888
(cherry picked from commit b17720bd6675de8d3925ea7fb2ea5c7a8f773ac4)
Diffstat (limited to 'openssl_err.cpp')
| -rw-r--r-- | openssl_err.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl_err.cpp b/openssl_err.cpp index b9c6153..04ab6f6 100644 --- a/openssl_err.cpp +++ b/openssl_err.cpp @@ -114,11 +114,13 @@ keymaster_error_t TranslateCipherError(int reason) { keymaster_error_t TranslateASN1Error(int reason) { switch (reason) { +#if !defined(OPENSSL_IS_BORINGSSL) case ASN1_R_UNSUPPORTED_CIPHER: return KM_ERROR_UNSUPPORTED_ALGORITHM; case ASN1_R_ERROR_LOADING_SECTION: return KM_ERROR_INVALID_KEY_BLOB; +#endif case ASN1_R_ENCODE_ERROR: return KM_ERROR_INVALID_ARGUMENT; |