summaryrefslogtreecommitdiffstats
path: root/src/include/openssl/stack.h
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-09-24 22:57:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-24 22:57:25 +0000
commit3781a60670f92c3c6fca860cb4589495cefa2e56 (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /src/include/openssl/stack.h
parent4ca36931e543512682d75e8e6d923144261dfd4d (diff)
parent1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff)
downloadexternal_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.zip
external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.gz
external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.bz2
am 1e4884f6: external/boringssl: sync with upstream.
* commit '1e4884f615b20946411a74e41eb9c6aa65e2d5f3': external/boringssl: sync with upstream.
Diffstat (limited to 'src/include/openssl/stack.h')
-rw-r--r--src/include/openssl/stack.h9
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