updated AmiSSLv4 sources to match OpenSSL 1.1.0c changes.

jens-maus · Nov 12, 2016 · a5b56c9 · a5b56c9
1 parent 6f2d82a
commit a5b56c9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /build_*
+.DS_Store
diff --git a/Makefile b/Makefile
@@ -151,11 +151,11 @@ endif
 # none - because we want to compile with -Wall all the time
 
 VERSION=4
-VERSIONNAME=110b
+VERSIONNAME=110c
 AMISSLREVISION=0
 AMISSLMASTERREVISION=0
-AMISSLDATE=26.09.2016
-AMISSLMASTERDATE=26.09.2016
+AMISSLDATE=10.11.2016
+AMISSLMASTERDATE=10.11.2016
 
 # Common Directories
 PREFIX    = $(CDTHIS)

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
@@ -42,11 +42,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1010002fL
+# define OPENSSL_VERSION_NUMBER  0x1010003fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0b-fips  26 Sep 2016"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0c-fips  10 Nov 2016"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0b  26 Sep 2016"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0c  10 Nov 2016"
 # endif
 
 /*-

diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
@@ -465,6 +465,7 @@ int ERR_load_RSA_strings(void);
 
 /* Function codes. */
 # define RSA_F_CHECK_PADDING_MD                           140
+# define RSA_F_ENCODE_PKCS1                               146
 # define RSA_F_INT_RSA_VERIFY                             145
 # define RSA_F_OLD_RSA_PRIV_DECODE                        147
 # define RSA_F_PKEY_RSA_CTRL                              143

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
@@ -2242,6 +2242,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358
 # define SSL_F_TLS_CONSTRUCT_FINISHED                     359
 # define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373
+# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           428
 # define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           374
 # define SSL_F_TLS_CONSTRUCT_SERVER_DONE                  375
 # define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 376

diff --git a/openssl/Configurations/10-main.conf b/openssl/Configurations/10-main.conf
@@ -1881,7 +1881,7 @@ sub vms_info {
         sys_id           => "AMIGA",
         bn_ops           => "THIRTY_TWO_BIT BN_LLONG RC4_CHAR EXPORT_VAR_AS_FN",
         shared_extension => ".library",
-        shared_ldflag    => "-resident32",
+        shared_ldflag    => add("-resident32"),
         ex_libs          => add('../libamisslauto.a ../libamisslstubs.a ../libamissldebug.a -lm'),
     },
 
@@ -1900,7 +1900,7 @@ sub vms_info {
         sys_id           => "AMIGA",
         bn_ops           => "THIRTY_TWO_BIT BN_LLONG RC4_CHAR EXPORT_VAR_AS_FN",
         shared_extension => ".library",
-        shared_ldflag    => "-mcrt=clib2",
+        shared_ldflag    => add("-mcrt=clib2"),
         ex_libs          => add('../libamisslauto.a ../libamisslstubs.a ../libamissldebug.a -lm'),
     },
 

diff --git a/src/amisslmaster_library.c b/src/amisslmaster_library.c
@@ -198,7 +198,7 @@ LIBPROTO(OpenAmiSSL, struct Library *, REG(a6, UNUSED __BASE_OR_IFACE))
     // if an application requests AmiSSL/OpenSSL versions 1.1.x we try to open any
     // known 1.1.X amissl library as OpenSSL defines binary/api compatibility when only
     // minor numbers are changed (https://www.openssl.org/support/faq.html#MISC8)
-    OpenLib(&AmiSSLBase,"libs:amissl/amissl_v110b.library", 4);
+    OpenLib(&AmiSSLBase,"libs:amissl/amissl_v110c.library", 4);
   }
   else if(LibAPIVersion == AMISSL_V10x)
   {