diff options
| author | Kenny Root <kroot@google.com> | 2015-10-02 16:09:15 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-10-02 16:09:49 -0700 |
| commit | fe7305364c3369f9222a61646c5c9842eae9bceb (patch) | |
| tree | 360ada970b7bb1046ae069d253ba24d9622eb3ad /src/include/openssl/stack.h | |
| parent | 691ef9d0ff0ece39ffd6a58960a7cd195ef584ae (diff) | |
| parent | b452bce3bf2034466cee6206ebf3994409468ee4 (diff) | |
| download | external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.zip external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.gz external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.bz2 | |
Merge mnc-dr-dev-plus-aosp into mnc-ub-dev
This pulls in the latest version of BoringSSL.
Change-Id: I0ab5c73d60f41a696c9a828fac87670aaca10dec
Diffstat (limited to 'src/include/openssl/stack.h')
| -rw-r--r-- | src/include/openssl/stack.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/include/openssl/stack.h b/src/include/openssl/stack.h index 350fa14..b600b43 100644 --- a/src/include/openssl/stack.h +++ b/src/include/openssl/stack.h @@ -111,11 +111,6 @@ typedef struct stack_st { #define STACK_OF(type) struct stack_st_##type -#define DEFINE_STACK_OF(type) \ -STACK_OF(type) {\ - _STACK stack; \ -} - #define DECLARE_STACK_OF(type) STACK_OF(type); /* The make_macros.sh script in this directory parses the following lines and @@ -140,12 +135,14 @@ STACK_OF(type) {\ * STACK_OF:GENERAL_NAMES * STACK_OF:GENERAL_SUBTREE * STACK_OF:MIME_HEADER - * STACK_OF:PKCS7_SIGNER_INFO * STACK_OF:PKCS7_RECIP_INFO + * STACK_OF:PKCS7_SIGNER_INFO * STACK_OF:POLICYINFO * STACK_OF:POLICYQUALINFO * STACK_OF:POLICY_MAPPING + * STACK_OF:RSA_additional_prime * STACK_OF:SSL_COMP + * STACK_OF:SSL_CUSTOM_EXTENSION * STACK_OF:STACK_OF_X509_NAME_ENTRY * STACK_OF:SXNETID * STACK_OF:X509 |