From a8eba56ef62af2f9a5b46825c994665cd3789c2e Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 7 Jan 2016 17:02:20 +0000 Subject: [PATCH 1/1] use more descriptive name DEFINE_STACK_OF_CONST Reviewed-by: Richard Levitte --- crypto/include/internal/asn1_int.h | 2 +- crypto/include/internal/evp_int.h | 2 +- include/openssl/safestack.h | 2 +- include/openssl/ssl.h | 2 +- util/mkstack.pl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h index c227224e59..43b541c493 100644 --- a/crypto/include/internal/asn1_int.h +++ b/crypto/include/internal/asn1_int.h @@ -104,7 +104,7 @@ struct evp_pkey_asn1_method_st { ASN1_BIT_STRING *sig); } /* EVP_PKEY_ASN1_METHOD */ ; -DEFINE_CONST_STACK_OF(EVP_PKEY_ASN1_METHOD) +DEFINE_STACK_OF_CONST(EVP_PKEY_ASN1_METHOD) extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index 831d9684ad..329f1ae355 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -120,7 +120,7 @@ struct evp_pkey_method_st { int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value); } /* EVP_PKEY_METHOD */ ; -DEFINE_CONST_STACK_OF(EVP_PKEY_METHOD) +DEFINE_STACK_OF_CONST(EVP_PKEY_METHOD) void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h index 5a786590ab..9eb4477001 100644 --- a/include/openssl/safestack.h +++ b/include/openssl/safestack.h @@ -185,7 +185,7 @@ extern "C" { # define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2) # define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t) -# define DEFINE_CONST_STACK_OF(t) SKM_DEFINE_STACK_OF(t, const t, t) +# define DEFINE_STACK_OF_CONST(t) SKM_DEFINE_STACK_OF(t, const t, t) /*- * Strings are special: normally an lhash entry will point to a single diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index fdee4833b8..ee1835a91b 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; -DEFINE_CONST_STACK_OF(SSL_CIPHER) +DEFINE_STACK_OF_CONST(SSL_CIPHER) /* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/ typedef struct srtp_protection_profile_st { diff --git a/util/mkstack.pl b/util/mkstack.pl index c2a7ee43ea..06cf0f99ce 100755 --- a/util/mkstack.pl +++ b/util/mkstack.pl @@ -214,7 +214,7 @@ extern "C" { # define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2) # define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t) -# define DEFINE_CONST_STACK_OF(t) SKM_DEFINE_STACK_OF(t, const t, t) +# define DEFINE_STACK_OF_CONST(t) SKM_DEFINE_STACK_OF(t, const t, t) /*- * Strings are special: normally an lhash entry will point to a single -- 2.34.1