[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e6c5dbc8e82214f659d5b905d7b4a04a8d1faa8d (commit)
      from  ad9a05621ac75b6b9db1e8856d7f434276b1a7af (commit)


- Log -----------------------------------------------------------------
commit e6c5dbc8e82214f659d5b905d7b4a04a8d1faa8d
Author: Marek Klein <kleinmrk at gmail.com>
Date:   Tue May 3 08:48:47 2016 +0000

    DEFINE_STACK_OF(ASN1_UTF8STRING) moved from ts_lcl.h to asn1.h
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1020)

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

Summary of changes:
 crypto/ts/ts_lcl.h     | 2 --
 include/openssl/asn1.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/ts/ts_lcl.h b/crypto/ts/ts_lcl.h
index e3f915c..657fbbb 100644
--- a/crypto/ts/ts_lcl.h
+++ b/crypto/ts/ts_lcl.h
@@ -144,8 +144,6 @@ struct TS_status_info_st {
     ASN1_BIT_STRING *failure_info;
 };
 
-DEFINE_STACK_OF(ASN1_UTF8STRING)
-
 /*-
  * IssuerSerial ::= SEQUENCE {
  *         issuer                   GeneralNames,
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 4c30a74..5fbe042 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -473,6 +473,8 @@ DEFINE_STACK_OF(ASN1_INTEGER)
 
 DEFINE_STACK_OF(ASN1_GENERALSTRING)
 
+DEFINE_STACK_OF(ASN1_UTF8STRING)
+
 typedef struct asn1_type_st {
     int type;
     union {