[openssl-commits] [openssl] master update

Andy Polyakov appro at openssl.org
Sun Apr 8 09:23:16 UTC 2018


The branch master has been updated
       via  6e301900503f43564029754c799976c89950d33e (commit)
       via  e14795f83bd99b7df6305e411d4b6c52bdd98938 (commit)
       via  f5e3115361f9e6f6407379d6c262b346e32ea25c (commit)
      from  2876872ffe5dd53ec1c446656e924ff463e5d4bf (commit)


- Log -----------------------------------------------------------------
commit 6e301900503f43564029754c799976c89950d33e
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 24 21:05:05 2018 +0100

    Configurations/10-main.conf: clean up HP-UX targets and add magic macros.
    
    HP-UX provides sockets symbols with incompatible prototypes under same
    name. This caused problems in 64-bit builds. Additional macros force
    unambiguous symbols with unambiguous prototypes.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5742)

commit e14795f83bd99b7df6305e411d4b6c52bdd98938
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 24 20:54:09 2018 +0100

    config: fix hpux64-parisc2-gcc detection.
    
    hpux64-parisc2-gcc is chosen based on gcc's bitness, and it was overriden
    unconditionally.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5742)

commit f5e3115361f9e6f6407379d6c262b346e32ea25c
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 24 20:45:43 2018 +0100

    test/asn1_time_test.c: make it work on 64-bit HP-UX.
    
    HP-UX gmtime fails with ERANGE past 19011213204552Z, so skip some tests.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5742)

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

Summary of changes:
 Configurations/10-main.conf | 35 +++++++++++++++++++++--------------
 config                      | 11 +++++------
 test/asn1_time_test.c       |  2 ++
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 03a53d3..7f1c64d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -452,14 +452,19 @@ my %targets = (
 #   targets; b) performance-critical 32-bit assembly modules implement
 #   even PA-RISC 2.0-specific code paths, which are chosen at run-time,
 #   thus adequate performance is provided even with PA-RISC 1.1 build.
+    "hpux-network" => {
+        template         => 1,
+        defines          => add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED",
+                                "_HPUX_ALT_XOPEN_SOCKET_API"),
+    },
     "hpux-parisc-gcc" => {
-        inherit_from     => [ "BASE_unix" ],
+        inherit_from     => [ "BASE_unix", "hpux-network" ],
         CC               => "gcc",
         CFLAGS           => picker(debug   => "-O0 -g",
                                    release => "-O3"),
         cflags           => add(threads("-pthread")),
         lib_cppflags     => "-DB_ENDIAN -DBN_DIV2W",
-        ex_libs          => add("-Wl,+s -ldld", threads("-pthread")),
+        ex_libs          => add("-ldld", threads("-pthread")),
         bn_ops           => "BN_LLONG",
         thread_scheme    => "pthreads",
         dso_scheme       => "dl",
@@ -473,13 +478,14 @@ my %targets = (
         multilib         => "/pa1.1",
     },
     "hpux64-parisc2-gcc" => {
-        inherit_from     => [ "BASE_unix", asm("parisc20_64_asm") ],
+        inherit_from     => [ "BASE_unix", "hpux-network",
+                              asm("parisc20_64_asm") ],
         CC               => "gcc",
         CFLAGS           => combine(picker(debug   => "-O0 -g",
                                            release => "-O3")),
-        cppflags         => threads("-D_REENTRANT"),
+        cflags           => add(threads("-pthread")),
         lib_cppflags     => "-DB_ENDIAN",
-        ex_libs          => add("-ldl"),
+        ex_libs          => add("-ldl", threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
@@ -492,14 +498,14 @@ my %targets = (
 
     # More attempts at unified 10.X and 11.X targets for HP C compiler.
     "hpux-parisc-cc" => {
-        inherit_from     => [ "BASE_unix" ],
+        inherit_from     => [ "BASE_unix", "hpux-network" ],
         CC               => "cc",
         CFLAGS           => picker(debug   => "+O0 +d -g",
                                    release => "+O3"),
         cflags           => "+Optrs_strongly_typed -Ae +ESlit",
         cppflags         => threads("-D_REENTRANT"),
         lib_cppflags     => "-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY",
-        ex_libs          => add("-Wl,+s -ldld",threads("-lpthread")),
+        ex_libs          => add("-ldld", threads("-lpthread")),
         bn_ops           => "RC4_CHAR",
         thread_scheme    => "pthreads",
         dso_scheme       => "dl",
@@ -514,14 +520,15 @@ my %targets = (
         multilib         => "/pa1.1",
     },
     "hpux64-parisc2-cc" => {
-        inherit_from     => [ "BASE_unix", asm("parisc20_64_asm") ],
+        inherit_from     => [ "BASE_unix", "hpux-network",
+                              asm("parisc20_64_asm") ],
         CC               => "cc",
         CFLAGS           => picker(debug   => "+O0 +d -g",
                                    release => "+O3") ,
         cflags           => "+DD64 +Optrs_strongly_typed -Ae +ESlit",
         cppflags         => threads("-D_REENTRANT") ,
         lib_cppflags     => "-DB_ENDIAN -DMD32_XARRAY",
-        ex_libs          => add("-ldl",threads("-lpthread")),
+        ex_libs          => add("-ldl", threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
@@ -534,14 +541,14 @@ my %targets = (
 
     # HP/UX IA-64 targets
     "hpux-ia64-cc" => {
-        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
         CC               => "cc",
         CFLAGS           => picker(debug   => "+O0 +d -g",
                                    release => "+O2"),
         cflags           => "-Ae +DD32 +Olit=all -z",
         cppflags         => add(threads("-D_REENTRANT")),
         lib_cppflags     => "-DB_ENDIAN",
-        ex_libs          => add("-ldl",threads("-lpthread")),
+        ex_libs          => add("-ldl", threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
@@ -552,7 +559,7 @@ my %targets = (
         multilib         => "/hpux32",
     },
     "hpux64-ia64-cc" => {
-        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
         CC               => "cc",
         CFLAGS           => picker(debug   => "+O0 +d -g",
                                    release => "+O3"),
@@ -571,7 +578,7 @@ my %targets = (
     },
     # GCC builds...
     "hpux-ia64-gcc" => {
-        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
         CC               => "gcc",
         CFLAGS           => picker(debug   => "-O0 -g",
                                    release => "-O3"),
@@ -588,7 +595,7 @@ my %targets = (
         multilib         => "/hpux32",
     },
     "hpux64-ia64-gcc" => {
-        inherit_from     => [ "BASE_unix", asm("ia64_asm") ],
+        inherit_from     => [ "BASE_unix", "hpux-network", asm("ia64_asm") ],
         CC               => "gcc",
         CFLAGS           => picker(debug   => "-O0 -g",
                                    release => "-O3"),
diff --git a/config b/config
index ce99302..a44cd21 100755
--- a/config
+++ b/config
@@ -760,7 +760,11 @@ case "$GUESSOS" in
 	        OUT="hpux-ia64-cc"
              fi
 	elif [ $CPU_VERSION -ge 532 ]; then	# PA-RISC 2.x CPU
-	     OUT=${OUT:-"hpux-parisc2-${CC}"}
+	     # PA-RISC 2.0 is no longer supported as separate 32-bit
+	     # target. This is compensated for by run-time detection
+	     # in most critical assembly modules and taking advantage
+	     # of 2.0 architecture in PA-RISC 1.1 build.
+	     OUT=${OUT:-"hpux-parisc1_1-${CC}"}
 	     if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
 		echo "WARNING! If you wish to build 64-bit library then you have to"
 		echo "         invoke '$THERE/Configure hpux64-parisc2-cc' *manually*."
@@ -769,11 +773,6 @@ case "$GUESSOS" in
 		  (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
 		fi
 	     fi
-	     # PA-RISC 2.0 is no longer supported as separate 32-bit
-	     # target. This is compensated for by run-time detection
-	     # in most critical assembly modules and taking advantage
-	     # of 2.0 architecture in PA-RISC 1.1 build.
-	     OUT="hpux-parisc1_1-${CC}"
 	elif [ $CPU_VERSION -ge 528 ]; then	# PA-RISC 1.1+ CPU
 	     OUT="hpux-parisc1_1-${CC}"
 	elif [ $CPU_VERSION -ge 523 ]; then	# PA-RISC 1.0 CPU
diff --git a/test/asn1_time_test.c b/test/asn1_time_test.c
index 25105c6..1df630f 100644
--- a/test/asn1_time_test.c
+++ b/test/asn1_time_test.c
@@ -346,10 +346,12 @@ int setup_tests(void)
     if (sizeof(time_t) > sizeof(uint32_t)) {
         TEST_info("Adding 64-bit time_t tests");
         ADD_ALL_TESTS(test_table_pos_64bit, OSSL_NELEM(tbl_testdata_pos_64bit));
+#ifndef __hpux
         if (!(t > 0) && ptm != NULL) {
             TEST_info("Adding negative-sign 64-bit time_t tests");
             ADD_ALL_TESTS(test_table_neg_64bit, OSSL_NELEM(tbl_testdata_neg_64bit));
         }
+#endif
     }
     ADD_ALL_TESTS(test_table_compare, OSSL_NELEM(tbl_compare_testdata));
     return 1;


More information about the openssl-commits mailing list