Release version 1.1.1+12v1.1.1+12

Upgrade to 1.1.1i

Add symlink attribute for symbolic links that refer to upstream subdirectories

Make the .map and .def files prerequisites of the libs type target

Canonicalize the license in the package manifests

Load the c.config module rather than c in openssl/tests/build/root.build

14 files changed, 69 insertions, 15 deletions

diff --git a/libcrypto/build/bootstrap.build b/libcrypto/build/bootstrap.build
index 7e94071..8fca9f0 100644
--- a/libcrypto/build/bootstrap.build
+++ b/libcrypto/build/bootstrap.build
@@ -27,7 +27,7 @@ using dist
 #
 # There is no way to deduce the ABI version from the release version, so we
 # obtain it from the SHLIB_VERSION_NUMBER macro definition in
-# ../libcrypto/openssl/opensslv.h.
+# ../libcrypto/include/openssl/opensslv.h.
 #
 if ($version.major == 1 && $version.minor == 1 && $version.patch == 1)
   abi_version = '1.1'
diff --git a/libcrypto/libcrypto/.gitattributes b/libcrypto/libcrypto/.gitattributes
new file mode 100644
index 0000000..ff2ff6e
--- /dev/null
+++ b/libcrypto/libcrypto/.gitattributes
@@ -0,0 +1,2 @@
+crypto  symlink=dir
+include symlink=dir
diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile
index e431cb0..65cbe76 100644
--- a/libcrypto/libcrypto/buildfile
+++ b/libcrypto/libcrypto/buildfile
@@ -19,7 +19,6 @@ lib{crypto}: {h   }{** -buildinf-body}              \
                        -mdc2/**                     \
                        -poly1305/poly1305_ieee754   \
                        -poly1305/poly1305_base2_44} \
-             {def }{libcrypto}                      \
       crypto/{file}{LPdir_*.c des/ncbc_enc.c}       \
              $imp_libs
 
@@ -36,7 +35,8 @@ linux   = ($tclass == 'linux')
 bsd     = ($tclass == 'bsd')
 windows = ($tclass == 'windows')
 
-lib{crypto}: file{libcrypto.map}: include = ($linux || $bsd ? adhoc : false)
+libs{crypto}: file{libcrypto.map}: include = ($linux || $bsd ? adhoc : false)
+libs{crypto}: def{libcrypto}:      include = $windows
 
 # Build options.
 #
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h
index 36f2daf..cf638d4 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-linux.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from ../include/openssl/opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -105,6 +105,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h
index 4fe7e1c..78d18d7 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from ../include/openssl/opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -111,6 +111,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h
index 45442b7..548ae7e 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by makefile from ..\include\openssl\opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -111,6 +111,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h
index 1243f27..97bc637 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from ../include/openssl/opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -108,6 +108,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h
index e215292..c7e272c 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-linux.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from ../include/openssl/opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -105,6 +105,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h
index 33d3468..05f8464 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from ../include/openssl/opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -111,6 +111,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h
index fae3465..3f3e024 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by Makefile from ../include/openssl/opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -111,6 +111,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h
index 4df6e6d..98a8571 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by makefile from ..\include\openssl\opensslconf.h.in
  *
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -111,6 +111,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif
 
diff --git a/libcrypto/libcrypto/libcrypto.def b/libcrypto/libcrypto/libcrypto.def
index a5c8b32..97c190c 100644
--- a/libcrypto/libcrypto/libcrypto.def
+++ b/libcrypto/libcrypto/libcrypto.def
@@ -1255,6 +1255,7 @@ EXPORTS
     EC_KEY_check_key
     EC_KEY_clear_flags
     EC_KEY_copy
+    EC_KEY_decoded_from_explicit_params
     EC_KEY_dup
     EC_KEY_free
     EC_KEY_generate_key
@@ -3379,6 +3380,7 @@ EXPORTS
     X509V3_string_free
     X509_ALGORS_it
     X509_ALGOR_cmp
+    X509_ALGOR_copy
     X509_ALGOR_dup
     X509_ALGOR_free
     X509_ALGOR_get0
@@ -3611,6 +3613,8 @@ EXPORTS
     X509_REQ_print
     X509_REQ_print_ex
     X509_REQ_print_fp
+    X509_REQ_set0_signature
+    X509_REQ_set1_signature_algo
     X509_REQ_set_extension_nids
     X509_REQ_set_pubkey
     X509_REQ_set_subject_name
diff --git a/libcrypto/libcrypto/libcrypto.map b/libcrypto/libcrypto/libcrypto.map
index d273e85..0244caa 100644
--- a/libcrypto/libcrypto/libcrypto.map
+++ b/libcrypto/libcrypto/libcrypto.map
@@ -4459,7 +4459,15 @@ OPENSSL_1_1_1e {
         EVP_PKEY_meth_set_digestsign;
         EVP_PKEY_meth_set_digestverify;
         RSA_get0_pss_params;
-    local: *;
 } OPENSSL_1_1_1d;
 
+OPENSSL_1_1_1h {
+    global:
+        EC_KEY_decoded_from_explicit_params;
+        X509_ALGOR_copy;
+        X509_REQ_set0_signature;
+        X509_REQ_set1_signature_algo;
+    local: *;
+} OPENSSL_1_1_1e;
+
 
diff --git a/libcrypto/manifest b/libcrypto/manifest
index 8b010fe..edb8f9b 100644
--- a/libcrypto/manifest
+++ b/libcrypto/manifest
@@ -3,13 +3,13 @@ name: libcrypto
 
 # Note: remember to update doc-url below!
 #
-version: 1.1.1+11
-upstream-version: 1.1.1g
+version: 1.1.1+12
+upstream-version: 1.1.1i
 
 project: openssl
 priority: security
 summary: C library providing general cryptography and X.509 support
-license: OpenSSL License, SSLeay License; Copyleft free dual software license.
+license: OpenSSL ; OpenSSL and Original SSLeay Licenses.
 topics: C, x.509, cryptography
 description-file: README
 url: https://www.openssl.org/