[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  338cb76220e641bba9684cab745b2105d6ac0558 (commit)
       via  d865cb13ba7118e74b83238c074ca548e0177663 (commit)
       via  eb6d5f99831e013945f002989e1060095b51345e (commit)
      from  76e0cd12f68f0b8173bc71ee6e9ad3ca453d5a28 (commit)


- Log -----------------------------------------------------------------
commit 338cb76220e641bba9684cab745b2105d6ac0558
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Oct 18 08:59:51 2015 +0200

    make update
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit d865cb13ba7118e74b83238c074ca548e0177663
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Oct 18 08:59:00 2015 +0200

    Add crypto/include/internal to the directories to scan for stack declarations
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit eb6d5f99831e013945f002989e1060095b51345e
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Oct 18 08:57:37 2015 +0200

    Because ct_locl.h is used between modules, move it to internal headers
    
    Rename it to ct_int.h
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/ct/Makefile                                 | 2 +-
 crypto/ct/ct_lib.c                                 | 2 +-
 crypto/{ct/ct_locl.h => include/internal/ct_int.h} | 0
 crypto/x509v3/Makefile                             | 5 +++--
 crypto/x509v3/v3_scts.c                            | 2 +-
 util/mkstack.pl                                    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename crypto/{ct/ct_locl.h => include/internal/ct_int.h} (100%)

diff --git a/crypto/ct/Makefile b/crypto/ct/Makefile
index fe2341d..3c89ac7 100644
--- a/crypto/ct/Makefile
+++ b/crypto/ct/Makefile
@@ -80,4 +80,4 @@ ct_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ct_lib.o: ../../include/openssl/tls1.h ../../include/openssl/x509.h
 ct_lib.o: ../../include/openssl/x509_vfy.h ../../ssl/packet_locl.h
 ct_lib.o: ../../ssl/record/record.h ../../ssl/ssl_locl.h
-ct_lib.o: ../include/internal/cryptlib.h ct_lib.c ct_locl.h
+ct_lib.o: ../include/internal/cryptlib.h ../include/internal/ct_int.h ct_lib.c
diff --git a/crypto/ct/ct_lib.c b/crypto/ct/ct_lib.c
index 7945745..eac6035 100644
--- a/crypto/ct/ct_lib.c
+++ b/crypto/ct/ct_lib.c
@@ -61,7 +61,7 @@
 # include <limits.h>
 # include "internal/cryptlib.h"
 # include "../ssl/ssl_locl.h"
-# include "ct_locl.h"
+# include "internal/ct_int.h"
 
 SCT *SCT_new(void)
 {
diff --git a/crypto/ct/ct_locl.h b/crypto/include/internal/ct_int.h
similarity index 100%
rename from crypto/ct/ct_locl.h
rename to crypto/include/internal/ct_int.h
diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index 87fc083..2188041 100644
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -523,7 +523,7 @@ v3_purp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 v3_purp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 v3_purp.o: ../../include/openssl/x509v3.h ../include/internal/cryptlib.h
 v3_purp.o: ../include/internal/x509_int.h v3_purp.c
-v3_scts.o: ../../crypto/ct/ct_locl.h ../../e_os.h ../../include/openssl/asn1.h
+v3_scts.o: ../../e_os.h ../../include/openssl/asn1.h
 v3_scts.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 v3_scts.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
 v3_scts.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -536,7 +536,8 @@ v3_scts.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 v3_scts.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_scts.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 v3_scts.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-v3_scts.o: ../include/internal/cryptlib.h ext_dat.h v3_scts.c
+v3_scts.o: ../include/internal/cryptlib.h ../include/internal/ct_int.h
+v3_scts.o: ext_dat.h v3_scts.c
 v3_skey.o: ../../e_os.h ../../include/openssl/asn1.h
 v3_skey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c
index 6d3665c..777378c 100644
--- a/crypto/x509v3/v3_scts.c
+++ b/crypto/x509v3/v3_scts.c
@@ -61,7 +61,7 @@
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
 #include "ext_dat.h"
-#include "crypto/ct/ct_locl.h"
+#include "internal/ct_int.h"
 
 #ifndef OPENSSL_NO_CT
 /* Signature and hash algorithms from RFC 5246 */
diff --git a/util/mkstack.pl b/util/mkstack.pl
index 8daa1f8..16a0172 100755
--- a/util/mkstack.pl
+++ b/util/mkstack.pl
@@ -15,7 +15,7 @@ my @sstacklst;
 my @asn1setlst;
 my @p12stklst;
 my @lhashlst;
-my @source = (<include/openssl/*.h>, <crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
+my @source = (<include/openssl/*.h>, <crypto/include/internal/*.h>, <crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
 foreach $file (@source) {
     next if -l $file;