[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6098b69e5817068c49e63487d3424b4122a1796d (commit)
      from  770dfe8dfae33e814198ad6e190d22981066a583 (commit)


- Log -----------------------------------------------------------------
commit 6098b69e5817068c49e63487d3424b4122a1796d
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Feb 21 13:23:06 2019 -0500

    Move ASN1_BROKEN macros
    
    They're only used in one place, and only for a legacy datatype.
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8302)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/n_pkey.c    | 6 ++++++
 include/openssl/asn1t.h | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index 12592d0..71f78f7 100644
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -22,6 +22,12 @@ NON_EMPTY_TRANSLATION_UNIT
 
 # ifndef OPENSSL_NO_RC4
 
+# define ASN1_BROKEN_SEQUENCE(tname) \
+        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
+        ASN1_SEQUENCE(tname)
+# define static_ASN1_BROKEN_SEQUENCE_END(stname) \
+        static_ASN1_SEQUENCE_END_ref(stname, stname)
+
 typedef struct netscape_pkey_st {
     int32_t version;
     X509_ALGOR *algor;
diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 1a836c9..8158c41 100644
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -165,10 +165,6 @@ extern "C" {
             {NULL, ASN1_AFLG_CONST_CB, 0, 0, cb, 0, const_cb}; \
         ASN1_SEQUENCE(tname)
 
-# define ASN1_BROKEN_SEQUENCE(tname) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, NULL, 0, NULL}; \
-        ASN1_SEQUENCE(tname)
-
 # define ASN1_SEQUENCE_ref(tname, cb) \
         static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), offsetof(tname, lock), cb, 0, NULL}; \
         ASN1_SEQUENCE(tname)
@@ -200,9 +196,6 @@ extern "C" {
                 #tname \
         ASN1_ITEM_end(tname)
 
-# define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
-# define static_ASN1_BROKEN_SEQUENCE_END(stname) \
-        static_ASN1_SEQUENCE_END_ref(stname, stname)
 
 # define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)