Release version 1.1.1+11v1.1.1+11

Upgrade to 1.1.1g

45 files changed, 134 insertions, 121 deletions

diff --git a/libcrypto/README-DEV b/libcrypto/README-DEV
index 27750e4..cda5843 100644
--- a/libcrypto/README-DEV
+++ b/libcrypto/README-DEV
@@ -4,23 +4,22 @@ See ../README-DEV for general notes on OpenSSL packaging.
 
 Symlink the required upstream files and directories into libcrypto/:
 
-$ ln -s ../../upstream/{crypto,include/internal,include/openssl,e_os.h} \
-  libcrypto
+$ ln -s ../../upstream/{crypto,include,e_os.h} libcrypto
 
 Create libcrypto/downstream/openssl/opensslconf.h including upstream's
 opensslconf.h, auto-generated for the current platform. Similarly, create
-libcrypto/downstream/internal{bn_conf.h,dso_conf.h}. Also define in
+libcrypto/downstream/crypto/{bn_conf.h,dso_conf.h}. Also define in
 opensslconf.h some common macros to avoid defining them via the -D
 preprocessor option (see libcrypto/buildfile for details). Note that
 opensslconf.h is included into all public headers and, presumably, all source
 files.
 
 Create libcrypto/buildinf-body.h.in using the upstream's auto-generated
-buildinf.h as a pattern. Create libcrypto/downstream/internal/buildinf.h,
+buildinf.h as a pattern. Create libcrypto/downstream/crypto/buildinf.h,
 replacing the upstream's auto-generated header and including our own
 auto-generated buildinf-body.h. Such a proxying is required for the headers
 auto-generating machinery to work properly (see
-libcrypto/downstream/internal/buildinf.h for details).
+libcrypto/downstream/crypto/buildinf.h for details).
 
 Copy upstream's auto-generated libcrypto.map and libcrypto.def into libcrypto/.
 Comment out the "LIBRARY libcrypto-1_1-..." line in libcrypto.def.
@@ -36,8 +35,8 @@ Figure out libssl-specific headers in libcrypto/openssl/ and disable their
 installation. First, you can exclude headers used for building libcrypto (which
 is assumed to already be built in source tree):
 
-$ cat `find libcrypto/crypto -name *.o.d` | sed -n -r -e 's%^.+/upstream/include/openssl/([^/]+)$%\1%p' | sort -u >crypto.tmp
-$ find libcrypto/openssl/ -name '*.h' | sort | sed -n -r -e 's%.+/([^/]+)$%\1%p' >openssl.tmp
+$ cat `find libcrypto/crypto/ -name '*.o.d'` | sed -n -r -e 's%^.+/include/openssl/([^/]+)$%\1%p' | sort -u >crypto.tmp
+$ find libcrypto/include/openssl/ -name '*.h' | sort | sed -n -r -e 's%.+/([^/]+)$%\1%p' >openssl.tmp
 $ comm -13 crypto.tmp openssl.tmp && rm crypto.tmp openssl.tmp
 
 The above commands result in:
diff --git a/libcrypto/libcrypto/buildfile b/libcrypto/libcrypto/buildfile
index b5be1e2..e431cb0 100644
--- a/libcrypto/libcrypto/buildfile
+++ b/libcrypto/libcrypto/buildfile
@@ -19,13 +19,13 @@ lib{crypto}: {h   }{** -buildinf-body}              \
                        -mdc2/**                     \
                        -poly1305/poly1305_ieee754   \
                        -poly1305/poly1305_base2_44} \
-             { def}{libcrypto}                      \
+             {def }{libcrypto}                      \
       crypto/{file}{LPdir_*.c des/ncbc_enc.c}       \
              $imp_libs
 
 # Symlinked where appropriate.
 #
-downstream/internal/h{platform}@./downstream/internal/: dist = false
+downstream/crypto/h{platform}@./downstream/crypto/: dist = false
 
 tclass = $c.target.class
 tsys   = $c.target.system
@@ -116,7 +116,7 @@ switch $c.class
 }
 
 # Escape backslashes and quotes in the compilation flags and substitute them
-# into internal/buildinf-body.h as string literals, one per line.
+# into buildinf-body.h as string literals, one per line.
 #
 # Note: the flag list will not reflect compiler options that build2 adds
 # implicitly (-fPIC, etc).
@@ -133,11 +133,11 @@ h{buildinf-body}: in{buildinf-body}
 # Note that we have to add "-I$src_root" for the headers auto-generating
 # machinery to work properly.
 #
-c.poptions =+ "-I$out_root" "-I$src_root"            \
-              "-I$src_base/downstream" "-I$src_base"
+c.poptions =+ "-I$out_root" "-I$src_root"                                  \
+              "-I$src_base/downstream" "-I$src_base" "-I$src_base/include"
 
-crypto/             c.poptions =+ "-I$src_base/include"
 crypto/evp/         c.poptions =+ "-I$src_root/libcrypto/crypto/modes"
+crypto/rand/        c.poptions =+ "-I$src_root/libcrypto/crypto/modes"
 crypto/ec/curve448/ c.poptions =+ "-I$src_base" "-I$src_base/arch_32"
 
 # Note that upstream defines OPENSSLDIR and ENGINESDIR differently for
@@ -172,7 +172,7 @@ crypto/ec/curve448/ c.poptions =+ "-I$src_base" "-I$src_base/arch_32"
 ns = $regex.apply({**.c -crypto/cversion.c}, '.c$', '')
 obj{$ns}: c.poptions += -DOPENSSLDIR='"\0"' -DENGINESDIR='"\0"'
 
-crypto/obj{cversion}: c.poptions =+ "-I$src_root/libcrypto/downstream/internal"
+crypto/obj{cversion}: c.poptions =+ "-I$src_root/libcrypto/downstream/crypto"
 
 switch $tclass, $tsys
 {
@@ -212,7 +212,8 @@ switch $tclass, $tsys
 
 # Export options.
 #
-lib{crypto}: cc.export.poptions = "-I$src_base/downstream" "-I$src_base"
+lib{crypto}: cc.export.poptions = "-I$src_base/downstream" \
+                                  "-I$src_base/include"
 
 # See bootstrap.build for details.
 #
@@ -225,11 +226,11 @@ else
 # only.
 #
 h{*}:                                install = false
-openssl/h{*}:                        install = include/openssl/
+include/openssl/h{*}:                install = include/openssl/
 downstream/openssl/h{*}:             install = include/openssl/
 downstream/openssl/opensslconf/h{*}: install = include/openssl/opensslconf/
 
 # Disable libssl headers installation (see ../README-DEV for details).
 #
 for h: dtls1 srtp ssl2 ssl3 sslerr ssl
-  openssl/h{$h}@./openssl/: install = false
+  include/openssl/h{$h}@./include/openssl/: install = false
diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf.h b/libcrypto/libcrypto/downstream/crypto/bn_conf.h
new file mode 100644
index 0000000..e56ebf1
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf.h
@@ -0,0 +1,13 @@
+/* file      : libcrypto/downstream/crypto/bn_conf.h -*- C -*-
+ * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
+ */
+
+#ifndef LIBCRYPTO_DOWNSTREAM_CRYPTO_BN_CONF_H
+#define LIBCRYPTO_DOWNSTREAM_CRYPTO_BN_CONF_H
+
+/*
+ * Include upstream's auto-generated platform-specific bn_conf.h.
+ */
+#include <crypto/bn_conf/platform.h>
+
+#endif /* LIBCRYPTO_DOWNSTREAM_CRYPTO_BN_CONF_H */
diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig b/libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig
new file mode 120000
index 0000000..8d10c99
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf.h.in.orig
@@ -0,0 +1 @@
+../../../../upstream/include/crypto/bn_conf.h.in
\ No newline at end of file
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h
index ae0c797..16d6e93 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-linux.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-linux.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h
index ae0c797..16d6e93 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-mingw32.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h
index 8bf99bf..d53620f 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/i686-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/i686-win32-msvc.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from ..\crypto\include\internal\bn_conf.h.in */
+/* Generated by makefile from ..\include\crypto\bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h
index d732646..d732646 120000
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/platform.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/platform.h
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h
index bfc2761..0bacac0 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-freebsd.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-freebsd.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.h
index bfc2761..0bacac0 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-linux.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-linux.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-macos.h
index bfc2761..0bacac0 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-macos.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-macos.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.h
index fd43626..8bcd127 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-mingw32.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h
index 2a89bad..2d8fa64 100644
--- a/libcrypto/libcrypto/downstream/internal/bn_conf/x86_64-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/x86_64-win32-msvc.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from ..\crypto\include\internal\bn_conf.h.in */
+/* Generated by makefile from ..\include\crypto\bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/libcrypto/libcrypto/downstream/internal/buildinf.h b/libcrypto/libcrypto/downstream/crypto/buildinf.h
index cfb656f..938b93f 100644
--- a/libcrypto/libcrypto/downstream/internal/buildinf.h
+++ b/libcrypto/libcrypto/downstream/crypto/buildinf.h
@@ -1,4 +1,4 @@
-/* file      : libcrypto/downstream/internal/buildinf.h -*- C -*-
+/* file      : libcrypto/downstream/crypto/buildinf.h -*- C -*-
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf.h b/libcrypto/libcrypto/downstream/crypto/dso_conf.h
new file mode 100644
index 0000000..1802916
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf.h
@@ -0,0 +1,13 @@
+/* file      : libcrypto/downstream/crypto/dso_conf.h -*- C -*-
+ * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
+ */
+
+#ifndef LIBCRYPTO_DOWNSTREAM_CRYPTO_DSO_CONF_H
+#define LIBCRYPTO_DOWNSTREAM_CRYPTO_DSO_CONF_H
+
+/*
+ * Include upstream's auto-generated platform-specific dso_conf.h.
+ */
+#include <crypto/dso_conf/platform.h>
+
+#endif /* LIBCRYPTO_DOWNSTREAM_CRYPTO_DSO_CONF_H */
diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig b/libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig
new file mode 120000
index 0000000..326fe07
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf.h.in.orig
@@ -0,0 +1 @@
+../../../../upstream/include/crypto/dso_conf.h.in
\ No newline at end of file
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h
index f938c33..2c3b479 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-linux.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-linux.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h
index 1856a5a..816754e 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-mingw32.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h
index e48dd73..576fcbe 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/i686-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/i686-win32-msvc.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from ..\crypto\include\internal\dso_conf.h.in */
+/* Generated by makefile from ..\include\crypto\dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/platform.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h
index d732646..d732646 120000
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/platform.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/platform.h
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h
index f938c33..2c3b479 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-freebsd.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-freebsd.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h
index f938c33..2c3b479 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-linux.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-linux.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h
index bff012c..d2e22e2 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-macos.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-macos.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h
index 1856a5a..816754e 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-mingw32.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from ../crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h
index e48dd73..576fcbe 100644
--- a/libcrypto/libcrypto/downstream/internal/dso_conf/x86_64-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/x86_64-win32-msvc.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from ..\crypto\include\internal\dso_conf.h.in */
+/* Generated by makefile from ..\include\crypto\dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/libcrypto/libcrypto/downstream/internal/platform.h b/libcrypto/libcrypto/downstream/crypto/platform.h
index e3badb6..1ec5c81 100644
--- a/libcrypto/libcrypto/downstream/internal/platform.h
+++ b/libcrypto/libcrypto/downstream/crypto/platform.h
@@ -1,4 +1,4 @@
-/* file      : libcrypto/downstream/internal/platform.h -*- C -*-
+/* file      : libcrypto/downstream/crypto/platform.h -*- C -*-
  * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
  */
 
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf.h b/libcrypto/libcrypto/downstream/internal/bn_conf.h
deleted file mode 100644
index bdbf8bc..0000000
--- a/libcrypto/libcrypto/downstream/internal/bn_conf.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* file      : libcrypto/downstream/internal/bn_conf.h -*- C -*-
- * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
- */
-
-#ifndef LIBCRYPTO_DOWNSTREAM_INTERNAL_BN_CONF_H
-#define LIBCRYPTO_DOWNSTREAM_INTERNAL_BN_CONF_H
-
-/*
- * Include upstream's auto-generated platform-specific bn_conf.h.
- */
-#include <internal/bn_conf/platform.h>
-
-#endif /* LIBCRYPTO_DOWNSTREAM_INTERNAL_BN_CONF_H */
diff --git a/libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig b/libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig
deleted file mode 120000
index 5bb452b..0000000
--- a/libcrypto/libcrypto/downstream/internal/bn_conf.h.in.orig
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/include/internal/bn_conf.h.in
\ No newline at end of file
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf.h b/libcrypto/libcrypto/downstream/internal/dso_conf.h
deleted file mode 100644
index 57990e7..0000000
--- a/libcrypto/libcrypto/downstream/internal/dso_conf.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* file      : libcrypto/downstream/internal/dso_conf.h -*- C -*-
- * license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
- */
-
-#ifndef LIBCRYPTO_DOWNSTREAM_INTERNAL_DSO_CONF_H
-#define LIBCRYPTO_DOWNSTREAM_INTERNAL_DSO_CONF_H
-
-/*
- * Include upstream's auto-generated platform-specific dso_conf.h.
- */
-#include <internal/dso_conf/platform.h>
-
-#endif /* LIBCRYPTO_DOWNSTREAM_INTERNAL_DSO_CONF_H */
diff --git a/libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig b/libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig
deleted file mode 120000
index 22614df..0000000
--- a/libcrypto/libcrypto/downstream/internal/dso_conf.h.in.orig
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/include/internal/dso_conf.h.in
\ No newline at end of file
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig b/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig
index 90cab9f..3de20e5 120000
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf.h.in.orig
@@ -1 +1 @@
-../../openssl/opensslconf.h.in
\ No newline at end of file
+../../include/openssl/opensslconf.h.in
\ No newline at end of file
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h
index 3016862..4fe7e1c 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-mingw32.h
@@ -36,6 +36,9 @@ extern "C" {
 #ifndef OPENSSL_RAND_SEED_OS
 # define OPENSSL_RAND_SEED_OS
 #endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
@@ -87,9 +90,6 @@ extern "C" {
 #ifndef OPENSSL_NO_STATIC_ENGINE
 # define OPENSSL_NO_STATIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h
index 892bfad..45442b7 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/i686-win32-msvc.h
@@ -36,6 +36,9 @@ extern "C" {
 #ifndef OPENSSL_RAND_SEED_OS
 # define OPENSSL_RAND_SEED_OS
 #endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
@@ -87,9 +90,6 @@ extern "C" {
 #ifndef OPENSSL_NO_STATIC_ENGINE
 # define OPENSSL_NO_STATIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h
index 258233b..3aa576e 120000
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/platform.h
@@ -1 +1 @@
-../../internal/platform.h
\ No newline at end of file
+../../crypto/platform.h
\ No newline at end of file
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h
index 6474e68..1243f27 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-freebsd.h
@@ -33,6 +33,9 @@ extern "C" {
 #ifndef OPENSSL_RAND_SEED_OS
 # define OPENSSL_RAND_SEED_OS
 #endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
@@ -84,9 +87,6 @@ extern "C" {
 #ifndef OPENSSL_NO_STATIC_ENGINE
 # define OPENSSL_NO_STATIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h
index 502c61e..33d3468 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-macos.h
@@ -36,6 +36,9 @@ extern "C" {
 #ifndef OPENSSL_RAND_SEED_OS
 # define OPENSSL_RAND_SEED_OS
 #endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
@@ -87,9 +90,6 @@ extern "C" {
 #ifndef OPENSSL_NO_STATIC_ENGINE
 # define OPENSSL_NO_STATIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#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 283367d..fae3465 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-mingw32.h
@@ -36,6 +36,9 @@ extern "C" {
 #ifndef OPENSSL_RAND_SEED_OS
 # define OPENSSL_RAND_SEED_OS
 #endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
@@ -87,9 +90,6 @@ extern "C" {
 #ifndef OPENSSL_NO_STATIC_ENGINE
 # define OPENSSL_NO_STATIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#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 1fc6036..4df6e6d 100644
--- a/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h
+++ b/libcrypto/libcrypto/downstream/openssl/opensslconf/x86_64-win32-msvc.h
@@ -36,6 +36,9 @@ extern "C" {
 #ifndef OPENSSL_RAND_SEED_OS
 # define OPENSSL_RAND_SEED_OS
 #endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
 #ifndef OPENSSL_NO_ASAN
 # define OPENSSL_NO_ASAN
 #endif
@@ -87,9 +90,6 @@ extern "C" {
 #ifndef OPENSSL_NO_STATIC_ENGINE
 # define OPENSSL_NO_STATIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/libcrypto/libcrypto/include b/libcrypto/libcrypto/include
new file mode 120000
index 0000000..01fbb48
--- /dev/null
+++ b/libcrypto/libcrypto/include
@@ -0,0 +1 @@
+../../upstream/include
\ No newline at end of file
diff --git a/libcrypto/libcrypto/internal b/libcrypto/libcrypto/internal
deleted file mode 120000
index 967b3ae..0000000
--- a/libcrypto/libcrypto/internal
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/include/internal
\ No newline at end of file
diff --git a/libcrypto/libcrypto/libcrypto.def b/libcrypto/libcrypto/libcrypto.def
index e37e2c1..a5c8b32 100644
--- a/libcrypto/libcrypto/libcrypto.def
+++ b/libcrypto/libcrypto/libcrypto.def
@@ -1794,6 +1794,8 @@ EXPORTS
     EVP_PKEY_meth_get_decrypt
     EVP_PKEY_meth_get_derive
     EVP_PKEY_meth_get_digest_custom
+    EVP_PKEY_meth_get_digestsign
+    EVP_PKEY_meth_get_digestverify
     EVP_PKEY_meth_get_encrypt
     EVP_PKEY_meth_get_init
     EVP_PKEY_meth_get_keygen
@@ -1814,6 +1816,8 @@ EXPORTS
     EVP_PKEY_meth_set_decrypt
     EVP_PKEY_meth_set_derive
     EVP_PKEY_meth_set_digest_custom
+    EVP_PKEY_meth_set_digestsign
+    EVP_PKEY_meth_set_digestverify
     EVP_PKEY_meth_set_encrypt
     EVP_PKEY_meth_set_init
     EVP_PKEY_meth_set_keygen
@@ -2913,6 +2917,7 @@ EXPORTS
     RSA_get0_multi_prime_factors
     RSA_get0_n
     RSA_get0_p
+    RSA_get0_pss_params
     RSA_get0_q
     RSA_get_default_method
     RSA_get_ex_data
diff --git a/libcrypto/libcrypto/libcrypto.map b/libcrypto/libcrypto/libcrypto.map
index 69e37a2..d273e85 100644
--- a/libcrypto/libcrypto/libcrypto.map
+++ b/libcrypto/libcrypto/libcrypto.map
@@ -4450,7 +4450,16 @@ OPENSSL_1_1_1d {
     global:
         X509_get0_authority_issuer;
         X509_get0_authority_serial;
-    local: *;
 } OPENSSL_1_1_1c;
 
+OPENSSL_1_1_1e {
+    global:
+        EVP_PKEY_meth_get_digestsign;
+        EVP_PKEY_meth_get_digestverify;
+        EVP_PKEY_meth_set_digestsign;
+        EVP_PKEY_meth_set_digestverify;
+        RSA_get0_pss_params;
+    local: *;
+} OPENSSL_1_1_1d;
+
 
diff --git a/libcrypto/libcrypto/openssl b/libcrypto/libcrypto/openssl
deleted file mode 120000
index cfc366f..0000000
--- a/libcrypto/libcrypto/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/include/openssl
\ No newline at end of file
diff --git a/libcrypto/manifest b/libcrypto/manifest
index 5025852..8b010fe 100644
--- a/libcrypto/manifest
+++ b/libcrypto/manifest
@@ -3,8 +3,8 @@ name: libcrypto
 
 # Note: remember to update doc-url below!
 #
-version: 1.1.1+10
-upstream-version: 1.1.1d
+version: 1.1.1+11
+upstream-version: 1.1.1g
 
 project: openssl
 priority: security
diff --git a/libcrypto/tests/basic/testscript b/libcrypto/tests/basic/testscript
index 7157abf..b09c7f0 100644
--- a/libcrypto/tests/basic/testscript
+++ b/libcrypto/tests/basic/testscript
@@ -2,7 +2,7 @@
 # license   : OpenSSL and SSLeay Licenses; see accompanying LICENSE file
 
 $* >>~"%EOO%"
-  version: OpenSSL 1.1.1d  10 Sep 2019
+  %version: OpenSSL .+%
   %built on: .+ UTC%
   %platform: $c.target.class-$c.target.cpu%
   %compiler: $c.class .*-DLIBCRYPTO_BUILD -DZLIB .*%