use more descriptive name DEFINE_STACK_OF_CONST

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/include/internal/asn1_int.h b/crypto/include/internal/asn1_int.h
index c227224e59b4231c0f471cf232cee42f4f8c3fe3..43b541c493222026acde4a4731484a1b957ef928 100644 (file)
--- 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 831d9684add2a62d01c74431c1e22c7123048c17..329f1ae3555b8f13d584afbef3355eee33946684 100644 (file)
--- 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 5a786590abe18a9d096f5df626559c8d08d49918..9eb4477001eaf937101c9b0cf4a08052bd9c96c0 100644 (file)
--- 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 fdee4833b856a8097912d75be4c35aa1acbb5ec0..ee1835a91bad4ffef6d5e6b6a0652ea000f8f6e9 100644 (file)
--- 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 c2a7ee43ea7179bbbad9613245fa9119697a5303..06cf0f99cec2ab876f0730d0bf17068a41609dab 100755 (executable)
--- 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