[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f6ce429084155b027a48f6426f6ff216debd3b5b (commit)
       via  2d5724aa21579184d78cba901c1099b67d649f9a (commit)
       via  e30dff9ee2b79bd62a2563f74574c635d716b56f (commit)
       via  bffb149054cb326c8b7aeb65995e445c5f890e6a (commit)
      from  39a470088af6f833bd1a912908c44bf4a9f48b0c (commit)


- Log -----------------------------------------------------------------
commit f6ce429084155b027a48f6426f6ff216debd3b5b
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 3 20:28:39 2016 +0200

    Change inclusion of sys/types.h to stdlib.h in include/openssl/ebcdic.h
    
    Needed to get size_t on Windows
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 2d5724aa21579184d78cba901c1099b67d649f9a
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 3 15:04:22 2016 +0200

    Add inclusion of stdlib.h in include/openssl/mdc2.h
    
    Needed to get size_t
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit e30dff9ee2b79bd62a2563f74574c635d716b56f
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 3 15:05:03 2016 +0200

    Add inclusion of openssl/x509.h in include/openssl/tls1.h
    
    Needed to get the needed declarations for STACK_OF(X509)
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit bffb149054cb326c8b7aeb65995e445c5f890e6a
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 3 15:02:10 2016 +0200

    Generate simple build test files
    
    Generate small test programs to check that external programs can be
    built with our stuff at a very basic level.
    
    For now, they check that each of our header files can be included
    individually without compile failure.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 include/openssl/ebcdic.h                           |  2 +-
 include/openssl/mdc2.h                             |  1 +
 include/openssl/tls1.h                             |  1 +
 test/build.info                                    | 28 +++++++++++++++++++++-
 .../90-test_bioprint.t => generate_buildtest.pl}   | 19 +++++++++++++--
 5 files changed, 47 insertions(+), 4 deletions(-)
 copy test/{recipes/90-test_bioprint.t => generate_buildtest.pl} (53%)

diff --git a/include/openssl/ebcdic.h b/include/openssl/ebcdic.h
index 8696c7a..aa01285 100644
--- a/include/openssl/ebcdic.h
+++ b/include/openssl/ebcdic.h
@@ -10,7 +10,7 @@
 #ifndef HEADER_EBCDIC_H
 # define HEADER_EBCDIC_H
 
-# include <sys/types.h>
+# include <stdlib.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h
index ca28842..aabd2bf 100644
--- a/include/openssl/mdc2.h
+++ b/include/openssl/mdc2.h
@@ -13,6 +13,7 @@
 # include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_NO_MDC2
+# include <stdlib.h>
 # include <openssl/des.h>
 # ifdef  __cplusplus
 extern "C" {
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 9446464..0537828 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -51,6 +51,7 @@
 # define HEADER_TLS1_H
 
 # include <openssl/buffer.h>
+# include <openssl/x509.h>
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/test/build.info b/test/build.info
index 84c881e..95afbe3 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,4 +1,4 @@
-{- use File::Spec::Functions qw/catdir rel2abs/; -}
+{- use File::Spec::Functions qw/catdir catfile rel2abs abs2rel updir/; -}
 IF[{- !$disabled{tests} -}]
   PROGRAMS=\
           aborttest \
@@ -254,4 +254,30 @@ IF[{- !$disabled{tests} -}]
   SOURCE[bioprinttest]=bioprinttest.c
   INCLUDE[bioprinttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
   DEPEND[bioprinttest]=../libcrypto
+  {-
+   use File::Basename;
+   use if $^O ne "VMS", 'File::Glob' => qw/glob/;
+
+   my $includes = join(" ",
+                       rel2abs(catdir($builddir,"../include")), "../include");
+   my @nogo_headers = ( "asn1_mac.h",
+                        "__decc_include_prologue.h",
+                        "__decc_include_epilogue.h" );
+   my @headerfiles = glob catfile($sourcedir,
+                                  updir(), "include", "openssl", "*.h");
+
+   foreach my $headerfile (@headerfiles) {
+       my $name = basename($headerfile, ".h");
+       next if $disabled{$name};
+       next if grep { $_ eq lc("$name.h") } @nogo_headers;
+       $OUT .= <<"_____";
+
+  PROGRAMS=buildtest_$name
+  GENERATE[buildtest_$name.c]=generate_buildtest.pl $name
+  SOURCE[buildtest_$name]=buildtest_$name.c
+  INCLUDE[buildtest_$name]=$includes
+  DEPEND[buildtest_$name]=../libssl ../libcrypto
+_____
+   }
+  -}
 ENDIF
diff --git a/test/recipes/90-test_bioprint.t b/test/generate_buildtest.pl
similarity index 53%
copy from test/recipes/90-test_bioprint.t
copy to test/generate_buildtest.pl
index b86e828..7921021 100644
--- a/test/recipes/90-test_bioprint.t
+++ b/test/generate_buildtest.pl
@@ -6,7 +6,22 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
+use strict;
+use warnings;
 
-use OpenSSL::Test::Simple;
+# First argument is name;
+my $name = shift @ARGV;
+# All other arguments are ignored for now
 
-simple_test("test_bioprint", "bioprinttest");
+print <<"_____";
+/*
+ * Generated with test/generate_buildtest.pl, to check that such a simple
+ * program builds.
+ */
+#include <openssl/$name.h>
+
+int main()
+{
+    return 0;
+}
+_____