diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-23 00:47:28 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-07 18:00:51 +0000 |
| commit | 4a640fb6c395302d7aad22833d573c44211b0a2d (patch) | |
| tree | dd8f1928f7ed2e3a9db1362934e6b37bfd8e9e12 /include | |
| parent | 411abf2dd37974a5baa54859c1abcd287b3c1181 (diff) | |
| download | openssl-4a640fb6c395302d7aad22833d573c44211b0a2d.tar.gz | |
Fix declarations and constification for inline stack.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/cms.h | 4 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 4 | ||||
| -rw-r--r-- | include/openssl/x509v3.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/openssl/cms.h b/include/openssl/cms.h index c424b761d3..9cbfaf58ce 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -56,6 +56,7 @@ # define HEADER_CMS_H # include <openssl/x509.h> +# include <openssl/x509v3.h> # ifdef OPENSSL_NO_CMS # error CMS is disabled. @@ -76,8 +77,9 @@ typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey; typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute; DECLARE_STACK_OF(CMS_SignerInfo) -DECLARE_STACK_OF(GENERAL_NAMES) DECLARE_STACK_OF(CMS_RecipientEncryptedKey) +DECLARE_STACK_OF(CMS_RecipientInfo) +DECLARE_STACK_OF(CMS_RevocationInfoChoice) DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest) DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index e6342946dd..b2e9209752 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -325,7 +325,7 @@ typedef struct ssl_session_st SSL_SESSION; typedef struct tls_sigalgs_st TLS_SIGALGS; typedef struct ssl_conf_ctx_st SSL_CONF_CTX; -DECLARE_STACK_OF(SSL_CIPHER) +DECLARE_CONST_STACK_OF(SSL_CIPHER) DECLARE_STACK_OF(danetls_record) @@ -343,7 +343,7 @@ typedef int (*tls_session_ticket_ext_cb_fn) (SSL *s, typedef int (*tls_session_secret_cb_fn) (SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, - SSL_CIPHER **cipher, void *arg); + const SSL_CIPHER **cipher, void *arg); /* Typedefs for handling custom extensions */ diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index 7932acb9c8..76d3c1f57e 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -206,8 +206,6 @@ typedef struct GENERAL_NAME_st { } d; } GENERAL_NAME; -typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES; - typedef struct ACCESS_DESCRIPTION_st { ASN1_OBJECT *method; GENERAL_NAME *location; @@ -220,6 +218,8 @@ typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE; typedef STACK_OF(ASN1_INTEGER) TLS_FEATURE; DECLARE_STACK_OF(GENERAL_NAME) +typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES; +DECLARE_STACK_OF(GENERAL_NAMES) DECLARE_STACK_OF(ACCESS_DESCRIPTION) |