diff options
author | Kenny Root <kroot@google.com> | 2015-11-05 20:20:47 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-05 20:20:47 +0000 |
commit | 9659931bf7d197c3ab757604b3ca730aeac2129f (patch) | |
tree | 24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/include/openssl/base.h | |
parent | 307714c70648c5d1caa23193f59a78f2ff72d2ea (diff) | |
parent | 03bcf618b7ed811b305845461fbb5497dfe55ac3 (diff) | |
download | external_boringssl-9659931bf7d197c3ab757604b3ca730aeac2129f.zip external_boringssl-9659931bf7d197c3ab757604b3ca730aeac2129f.tar.gz external_boringssl-9659931bf7d197c3ab757604b3ca730aeac2129f.tar.bz2 |
Merge "Revert "external/boringssl: sync with upstream.""
Diffstat (limited to 'src/include/openssl/base.h')
-rw-r--r-- | src/include/openssl/base.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/include/openssl/base.h b/src/include/openssl/base.h index ea7185f..41e4b60 100644 --- a/src/include/openssl/base.h +++ b/src/include/openssl/base.h @@ -109,7 +109,6 @@ extern "C" { #define OPENSSL_IS_BORINGSSL #define OPENSSL_VERSION_NUMBER 0x10002000 -#define BORINGSSL_201510 #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER #if defined(BORINGSSL_SHARED_LIBRARY) @@ -215,7 +214,6 @@ typedef struct env_md_st EVP_MD; typedef struct evp_aead_st EVP_AEAD; typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; typedef struct evp_cipher_st EVP_CIPHER; -typedef struct evp_encode_ctx_st EVP_ENCODE_CTX; typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD; typedef struct evp_pkey_ctx_st EVP_PKEY_CTX; typedef struct evp_pkey_method_st EVP_PKEY_METHOD; |