diff --git a/README.md b/README.md
index 4a3dc6d..bc0d213 100644
--- a/README.md
+++ b/README.md
@@ -11,3 +11,5 @@ Included precompiled arm, arm-v7a, arm64-v8a, x86, x86_64.
 * arm64-v8a, x86_64 built with target android-21
 
 #### 18/12/27 - Added OpenSSL 1.1.1a libraries built with *llvm*
+
+#### 20/03/02 - Added OpenSSL 1.1.1d libraries built with *llvm*, 1.1.1a dropped
diff --git a/openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.so.1.1 b/openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.so.1.1
deleted file mode 100755
index 39979e5..0000000
Binary files a/openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.a b/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.a
deleted file mode 100644
index 9f64fb8..0000000
Binary files a/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.a and /dev/null differ
diff --git a/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.so.1.1 b/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.so.1.1
deleted file mode 100755
index 1d57a5b..0000000
Binary files a/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.so.1.1 b/openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.so.1.1
deleted file mode 100755
index 4511f70..0000000
Binary files a/openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.a b/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.a
deleted file mode 100644
index 0a87cfb..0000000
Binary files a/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.a and /dev/null differ
diff --git a/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.so.1.1 b/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.so.1.1
deleted file mode 100755
index 4101bbf..0000000
Binary files a/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/include/internal/thread_once.h b/openssl-1.1.1a-clang/include/internal/thread_once.h
deleted file mode 100644
index 2242443..0000000
--- a/openssl-1.1.1a-clang/include/internal/thread_once.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 1995-2016 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
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <openssl/crypto.h>
-
-#define DEFINE_RUN_ONCE(init)                   \
-    static int init(void);                     \
-    int init##_ossl_ret_ = 0;                   \
-    void init##_ossl_(void)                     \
-    {                                           \
-        init##_ossl_ret_ = init();              \
-    }                                           \
-    static int init(void)
-#define DECLARE_RUN_ONCE(init)                  \
-    extern int init##_ossl_ret_;                \
-    void init##_ossl_(void);
-
-#define DEFINE_RUN_ONCE_STATIC(init)            \
-    static int init(void);                     \
-    static int init##_ossl_ret_ = 0;            \
-    static void init##_ossl_(void)              \
-    {                                           \
-        init##_ossl_ret_ = init();              \
-    }                                           \
-    static int init(void)
-
-/*
- * RUN_ONCE - use CRYPTO_THREAD_run_once, and check if the init succeeded
- * @once: pointer to static object of type CRYPTO_ONCE
- * @init: function name that was previously given to DEFINE_RUN_ONCE,
- *        DEFINE_RUN_ONCE_STATIC or DECLARE_RUN_ONCE.  This function
- *        must return 1 for success or 0 for failure.
- *
- * The return value is 1 on success (*) or 0 in case of error.
- *
- * (*) by convention, since the init function must return 1 on success.
- */
-#define RUN_ONCE(once, init)                                            \
-    (CRYPTO_THREAD_run_once(once, init##_ossl_) ? init##_ossl_ret_ : 0)
diff --git a/openssl-1.1.1a-clang/x86/lib/libcrypto.so.1.1 b/openssl-1.1.1a-clang/x86/lib/libcrypto.so.1.1
deleted file mode 100755
index 781cead..0000000
Binary files a/openssl-1.1.1a-clang/x86/lib/libcrypto.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/x86/lib/libssl.a b/openssl-1.1.1a-clang/x86/lib/libssl.a
deleted file mode 100644
index 8060fe0..0000000
Binary files a/openssl-1.1.1a-clang/x86/lib/libssl.a and /dev/null differ
diff --git a/openssl-1.1.1a-clang/x86/lib/libssl.so.1.1 b/openssl-1.1.1a-clang/x86/lib/libssl.so.1.1
deleted file mode 100755
index 9365e9b..0000000
Binary files a/openssl-1.1.1a-clang/x86/lib/libssl.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/x86_64/lib/libcrypto.so.1.1 b/openssl-1.1.1a-clang/x86_64/lib/libcrypto.so.1.1
deleted file mode 100755
index 58a963a..0000000
Binary files a/openssl-1.1.1a-clang/x86_64/lib/libcrypto.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/x86_64/lib/libssl.a b/openssl-1.1.1a-clang/x86_64/lib/libssl.a
deleted file mode 100644
index cd8d70e..0000000
Binary files a/openssl-1.1.1a-clang/x86_64/lib/libssl.a and /dev/null differ
diff --git a/openssl-1.1.1a-clang/x86_64/lib/libssl.so.1.1 b/openssl-1.1.1a-clang/x86_64/lib/libssl.so.1.1
deleted file mode 100755
index 464da05..0000000
Binary files a/openssl-1.1.1a-clang/x86_64/lib/libssl.so.1.1 and /dev/null differ
diff --git a/openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.a b/openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.a
similarity index 79%
rename from openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.a
rename to openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.a
index 9ca4945..72aa4ff 100644
Binary files a/openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.a and b/openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.a differ
diff --git a/openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.so b/openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.so
similarity index 100%
rename from openssl-1.1.1a-clang/arm64-v8a/lib/libcrypto.so
rename to openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.so
diff --git a/openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.so.1.1 b/openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.so.1.1
new file mode 100755
index 0000000..d16cac0
Binary files /dev/null and b/openssl-1.1.1d-clang/arm64-v8a/lib/libcrypto.so.1.1 differ
diff --git a/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.a b/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.a
new file mode 100644
index 0000000..b153c02
Binary files /dev/null and b/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.a differ
diff --git a/openssl-1.1.1a-clang/arm64-v8a/lib/libssl.so b/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.so
similarity index 100%
rename from openssl-1.1.1a-clang/arm64-v8a/lib/libssl.so
rename to openssl-1.1.1d-clang/arm64-v8a/lib/libssl.so
diff --git a/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.so.1.1 b/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.so.1.1
new file mode 100755
index 0000000..b310e47
Binary files /dev/null and b/openssl-1.1.1d-clang/arm64-v8a/lib/libssl.so.1.1 differ
diff --git a/openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.a b/openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.a
similarity index 80%
rename from openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.a
rename to openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.a
index 5cfd71e..84d9e0c 100644
Binary files a/openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.a and b/openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.a differ
diff --git a/openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.so b/openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.so
similarity index 100%
rename from openssl-1.1.1a-clang/armeabi-v7a/lib/libcrypto.so
rename to openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.so
diff --git a/openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.so.1.1 b/openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.so.1.1
new file mode 100755
index 0000000..73ad330
Binary files /dev/null and b/openssl-1.1.1d-clang/armeabi-v7a/lib/libcrypto.so.1.1 differ
diff --git a/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.a b/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.a
new file mode 100644
index 0000000..85fcf78
Binary files /dev/null and b/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.a differ
diff --git a/openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.so b/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.so
similarity index 100%
rename from openssl-1.1.1a-clang/armeabi-v7a/lib/libssl.so
rename to openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.so
diff --git a/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.so.1.1 b/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.so.1.1
new file mode 100755
index 0000000..6f7896d
Binary files /dev/null and b/openssl-1.1.1d-clang/armeabi-v7a/lib/libssl.so.1.1 differ
diff --git a/openssl-1.1.1a-clang/include/internal/__DECC_INCLUDE_EPILOGUE.H b/openssl-1.1.1d-clang/include/internal/__DECC_INCLUDE_EPILOGUE.H
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/__DECC_INCLUDE_EPILOGUE.H
rename to openssl-1.1.1d-clang/include/internal/__DECC_INCLUDE_EPILOGUE.H
diff --git a/openssl-1.1.1a-clang/include/internal/__DECC_INCLUDE_PROLOGUE.H b/openssl-1.1.1d-clang/include/internal/__DECC_INCLUDE_PROLOGUE.H
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/__DECC_INCLUDE_PROLOGUE.H
rename to openssl-1.1.1d-clang/include/internal/__DECC_INCLUDE_PROLOGUE.H
diff --git a/openssl-1.1.1a-clang/include/internal/bio.h b/openssl-1.1.1d-clang/include/internal/bio.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/bio.h
rename to openssl-1.1.1d-clang/include/internal/bio.h
diff --git a/openssl-1.1.1a-clang/include/internal/comp.h b/openssl-1.1.1d-clang/include/internal/comp.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/comp.h
rename to openssl-1.1.1d-clang/include/internal/comp.h
diff --git a/openssl-1.1.1a-clang/include/internal/conf.h b/openssl-1.1.1d-clang/include/internal/conf.h
similarity index 61%
rename from openssl-1.1.1a-clang/include/internal/conf.h
rename to openssl-1.1.1d-clang/include/internal/conf.h
index dc1e725..29bc9f9 100644
--- a/openssl-1.1.1a-clang/include/internal/conf.h
+++ b/openssl-1.1.1d-clang/include/internal/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2019 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
@@ -12,11 +12,18 @@
 
 #include <openssl/conf.h>
 
+#define DEFAULT_CONF_MFLAGS \
+    (CONF_MFLAGS_DEFAULT_SECTION | \
+     CONF_MFLAGS_IGNORE_MISSING_FILE | \
+     CONF_MFLAGS_IGNORE_RETURN_CODES)
+
 struct ossl_init_settings_st {
+    char *filename;
     char *appname;
+    unsigned long flags;
 };
 
-void openssl_config_int(const char *appname);
+int openssl_config_int(const OPENSSL_INIT_SETTINGS *);
 void openssl_no_config_int(void);
 void conf_modules_free_int(void);
 
diff --git a/openssl-1.1.1a-clang/include/internal/constant_time_locl.h b/openssl-1.1.1d-clang/include/internal/constant_time_locl.h
similarity index 85%
rename from openssl-1.1.1a-clang/include/internal/constant_time_locl.h
rename to openssl-1.1.1d-clang/include/internal/constant_time_locl.h
index 82ff746..0193a65 100644
--- a/openssl-1.1.1a-clang/include/internal/constant_time_locl.h
+++ b/openssl-1.1.1d-clang/include/internal/constant_time_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2019 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
@@ -213,18 +213,72 @@ static ossl_inline unsigned char constant_time_eq_int_8(int a, int b)
     return constant_time_eq_8((unsigned)(a), (unsigned)(b));
 }
 
+/*
+ * Returns the value unmodified, but avoids optimizations.
+ * The barriers prevent the compiler from narrowing down the
+ * possible value range of the mask and ~mask in the select
+ * statements, which avoids the recognition of the select
+ * and turning it into a conditional load or branch.
+ */
+static ossl_inline unsigned int value_barrier(unsigned int a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    unsigned int r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile unsigned int r = a;
+#endif
+    return r;
+}
+
+/* Convenience method for uint32_t. */
+static ossl_inline uint32_t value_barrier_32(uint32_t a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    uint32_t r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile uint32_t r = a;
+#endif
+    return r;
+}
+
+/* Convenience method for uint64_t. */
+static ossl_inline uint64_t value_barrier_64(uint64_t a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    uint64_t r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile uint64_t r = a;
+#endif
+    return r;
+}
+
+/* Convenience method for size_t. */
+static ossl_inline size_t value_barrier_s(size_t a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    size_t r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile size_t r = a;
+#endif
+    return r;
+}
+
 static ossl_inline unsigned int constant_time_select(unsigned int mask,
                                                      unsigned int a,
                                                      unsigned int b)
 {
-    return (mask & a) | (~mask & b);
+    return (value_barrier(mask) & a) | (value_barrier(~mask) & b);
 }
 
 static ossl_inline size_t constant_time_select_s(size_t mask,
                                                  size_t a,
                                                  size_t b)
 {
-    return (mask & a) | (~mask & b);
+    return (value_barrier_s(mask) & a) | (value_barrier_s(~mask) & b);
 }
 
 static ossl_inline unsigned char constant_time_select_8(unsigned char mask,
@@ -249,13 +303,13 @@ static ossl_inline int constant_time_select_int_s(size_t mask, int a, int b)
 static ossl_inline uint32_t constant_time_select_32(uint32_t mask, uint32_t a,
                                                     uint32_t b)
 {
-    return (mask & a) | (~mask & b);
+    return (value_barrier_32(mask) & a) | (value_barrier_32(~mask) & b);
 }
 
 static ossl_inline uint64_t constant_time_select_64(uint64_t mask, uint64_t a,
                                                     uint64_t b)
 {
-    return (mask & a) | (~mask & b);
+    return (value_barrier_64(mask) & a) | (value_barrier_64(~mask) & b);
 }
 
 /*
@@ -324,4 +378,10 @@ static ossl_inline void constant_time_lookup(void *out,
     }
 }
 
+/*
+ * Expected usage pattern is to unconditionally set error and then
+ * wipe it if there was no actual error. |clear| is 1 or 0.
+ */
+void err_clear_last_constant_time(int clear);
+
 #endif                          /* HEADER_CONSTANT_TIME_LOCL_H */
diff --git a/openssl-1.1.1a-clang/include/internal/cryptlib.h b/openssl-1.1.1d-clang/include/internal/cryptlib.h
similarity index 92%
rename from openssl-1.1.1a-clang/include/internal/cryptlib.h
rename to openssl-1.1.1d-clang/include/internal/cryptlib.h
index 329ef62..23e17e5 100644
--- a/openssl-1.1.1a-clang/include/internal/cryptlib.h
+++ b/openssl-1.1.1d-clang/include/internal/cryptlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -80,6 +80,7 @@ extern unsigned int OPENSSL_ia32cap_P[];
 void OPENSSL_showfatal(const char *fmta, ...);
 void crypto_cleanup_all_ex_data_int(void);
 int openssl_init_fork_handlers(void);
+int openssl_get_fork_id(void);
 
 char *ossl_safe_getenv(const char *name);
 
@@ -92,5 +93,7 @@ void *openssl_fopen(const char *filename, const char *mode);
 # endif
 
 uint32_t OPENSSL_rdtsc(void);
+size_t OPENSSL_instrument_bus(unsigned int *, size_t);
+size_t OPENSSL_instrument_bus2(unsigned int *, size_t, size_t);
 
 #endif
diff --git a/openssl-1.1.1a-clang/include/internal/dane.h b/openssl-1.1.1d-clang/include/internal/dane.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/dane.h
rename to openssl-1.1.1d-clang/include/internal/dane.h
diff --git a/openssl-1.1.1a-clang/include/internal/dso.h b/openssl-1.1.1d-clang/include/internal/dso.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/dso.h
rename to openssl-1.1.1d-clang/include/internal/dso.h
diff --git a/openssl-1.1.1a-clang/include/internal/dsoerr.h b/openssl-1.1.1d-clang/include/internal/dsoerr.h
similarity index 95%
rename from openssl-1.1.1a-clang/include/internal/dsoerr.h
rename to openssl-1.1.1d-clang/include/internal/dsoerr.h
index a54a185..5f4511c 100644
--- a/openssl-1.1.1a-clang/include/internal/dsoerr.h
+++ b/openssl-1.1.1d-clang/include/internal/dsoerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,13 +11,13 @@
 #ifndef HEADER_DSOERR_H
 # define HEADER_DSOERR_H
 
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_DSO
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
 
-#  ifdef  __cplusplus
+# ifdef  __cplusplus
 extern "C"
-#  endif
+# endif
 int ERR_load_DSO_strings(void);
 
 /*
@@ -79,5 +79,4 @@ int ERR_load_DSO_strings(void);
 #  define DSO_R_UNLOAD_FAILED                              107
 #  define DSO_R_UNSUPPORTED                                108
 
-# endif
 #endif
diff --git a/openssl-1.1.1a-clang/include/internal/err.h b/openssl-1.1.1d-clang/include/internal/err.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/err.h
rename to openssl-1.1.1d-clang/include/internal/err.h
diff --git a/openssl-1.1.1a-clang/include/internal/nelem.h b/openssl-1.1.1d-clang/include/internal/nelem.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/nelem.h
rename to openssl-1.1.1d-clang/include/internal/nelem.h
diff --git a/openssl-1.1.1a-clang/include/internal/numbers.h b/openssl-1.1.1d-clang/include/internal/numbers.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/numbers.h
rename to openssl-1.1.1d-clang/include/internal/numbers.h
diff --git a/openssl-1.1.1a-clang/include/internal/o_dir.h b/openssl-1.1.1d-clang/include/internal/o_dir.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/o_dir.h
rename to openssl-1.1.1d-clang/include/internal/o_dir.h
diff --git a/openssl-1.1.1a-clang/include/internal/o_str.h b/openssl-1.1.1d-clang/include/internal/o_str.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/o_str.h
rename to openssl-1.1.1d-clang/include/internal/o_str.h
diff --git a/openssl-1.1.1a-clang/include/internal/refcount.h b/openssl-1.1.1d-clang/include/internal/refcount.h
similarity index 87%
rename from openssl-1.1.1a-clang/include/internal/refcount.h
rename to openssl-1.1.1d-clang/include/internal/refcount.h
index 75d70a6..6e1a840 100644
--- a/openssl-1.1.1a-clang/include/internal/refcount.h
+++ b/openssl-1.1.1d-clang/include/internal/refcount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2019 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
@@ -79,7 +79,7 @@ static __inline__ int CRYPTO_DOWN_REF(int *val, int *ret, void *lock)
 
 typedef volatile int CRYPTO_REF_COUNT;
 
-#  if (defined(_M_ARM) && _M_ARM>=7) || defined(_M_ARM64)
+#  if (defined(_M_ARM) && _M_ARM>=7 && !defined(_WIN32_WCE)) || defined(_M_ARM64)
 #   include <intrin.h>
 #   if defined(_M_ARM64) && !defined(_ARM_BARRIER_ISH)
 #    define _ARM_BARRIER_ISH _ARM64_BARRIER_ISH
@@ -99,7 +99,17 @@ static __inline int CRYPTO_DOWN_REF(volatile int *val, int *ret, void *lock)
     return 1;
 }
 #  else
-#   pragma intrinsic(_InterlockedExchangeAdd)
+#   if !defined(_WIN32_WCE)
+#    pragma intrinsic(_InterlockedExchangeAdd)
+#   else
+#    if _WIN32_WCE >= 0x600
+      extern long __cdecl _InterlockedExchangeAdd(long volatile*, long);
+#    else
+      /* under Windows CE we still have old-style Interlocked* functions */
+      extern long __cdecl InterlockedExchangeAdd(long volatile*, long);
+#     define _InterlockedExchangeAdd InterlockedExchangeAdd
+#    endif
+#   endif
 
 static __inline int CRYPTO_UP_REF(volatile int *val, int *ret, void *lock)
 {
diff --git a/openssl-1.1.1a-clang/include/internal/sockets.h b/openssl-1.1.1d-clang/include/internal/sockets.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/internal/sockets.h
rename to openssl-1.1.1d-clang/include/internal/sockets.h
index a6026da..5bb0355 100644
--- a/openssl-1.1.1a-clang/include/internal/sockets.h
+++ b/openssl-1.1.1d-clang/include/internal/sockets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -72,11 +72,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #  else
 #   include <sys/socket.h>
 #   ifndef NO_SYS_UN_H
-#    ifdef OPENSSL_SYS_VXWORKS
-#     include <streams/un.h>
-#    else
-#     include <sys/un.h>
-#    endif
+#    include <sys/un.h>
 #    ifndef UNIX_PATH_MAX
 #     define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
 #    endif
diff --git a/openssl-1.1.1a-clang/include/internal/sslconf.h b/openssl-1.1.1d-clang/include/internal/sslconf.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/internal/sslconf.h
rename to openssl-1.1.1d-clang/include/internal/sslconf.h
diff --git a/openssl-1.1.1d-clang/include/internal/thread_once.h b/openssl-1.1.1d-clang/include/internal/thread_once.h
new file mode 100644
index 0000000..8f8aa6e
--- /dev/null
+++ b/openssl-1.1.1d-clang/include/internal/thread_once.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright 1995-2019 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <openssl/crypto.h>
+
+/*
+ * DEFINE_RUN_ONCE: Define an initialiser function that should be run exactly
+ * once. It takes no arguments and returns and int result (1 for success or
+ * 0 for failure). Typical usage might be:
+ *
+ * DEFINE_RUN_ONCE(myinitfunc)
+ * {
+ *     do_some_initialisation();
+ *     if (init_is_successful())
+ *         return 1;
+ *
+ *     return 0;
+ * }
+ */
+#define DEFINE_RUN_ONCE(init)                   \
+    static int init(void);                     \
+    int init##_ossl_ret_ = 0;                   \
+    void init##_ossl_(void)                     \
+    {                                           \
+        init##_ossl_ret_ = init();              \
+    }                                           \
+    static int init(void)
+
+/*
+ * DECLARE_RUN_ONCE: Declare an initialiser function that should be run exactly
+ * once that has been defined in another file via DEFINE_RUN_ONCE().
+ */
+#define DECLARE_RUN_ONCE(init)                  \
+    extern int init##_ossl_ret_;                \
+    void init##_ossl_(void);
+
+/*
+ * DEFINE_RUN_ONCE_STATIC: Define an initialiser function that should be run
+ * exactly once. This function will be declared as static within the file. It
+ * takes no arguments and returns and int result (1 for success or 0 for
+ * failure). Typical usage might be:
+ *
+ * DEFINE_RUN_ONCE_STATIC(myinitfunc)
+ * {
+ *     do_some_initialisation();
+ *     if (init_is_successful())
+ *         return 1;
+ *
+ *     return 0;
+ * }
+ */
+#define DEFINE_RUN_ONCE_STATIC(init)            \
+    static int init(void);                     \
+    static int init##_ossl_ret_ = 0;            \
+    static void init##_ossl_(void)              \
+    {                                           \
+        init##_ossl_ret_ = init();              \
+    }                                           \
+    static int init(void)
+
+/*
+ * DEFINE_RUN_ONCE_STATIC_ALT: Define an alternative initialiser function. This
+ * function will be declared as static within the file. It takes no arguments
+ * and returns an int result (1 for success or 0 for failure). An alternative
+ * initialiser function is expected to be associated with a primary initialiser
+ * function defined via DEFINE_ONCE_STATIC where both functions use the same
+ * CRYPTO_ONCE object to synchronise. Where an alternative initialiser function
+ * is used only one of the primary or the alternative initialiser function will
+ * ever be called - and that function will be called exactly once. Definition
+ * of an alternative initialiser function MUST occur AFTER the definition of the
+ * primary initialiser function.
+ *
+ * Typical usage might be:
+ *
+ * DEFINE_RUN_ONCE_STATIC(myinitfunc)
+ * {
+ *     do_some_initialisation();
+ *     if (init_is_successful())
+ *         return 1;
+ *
+ *     return 0;
+ * }
+ *
+ * DEFINE_RUN_ONCE_STATIC_ALT(myaltinitfunc, myinitfunc)
+ * {
+ *     do_some_alternative_initialisation();
+ *     if (init_is_successful())
+ *         return 1;
+ *
+ *     return 0;
+ * }
+ */
+#define DEFINE_RUN_ONCE_STATIC_ALT(initalt, init) \
+    static int initalt(void);                     \
+    static void initalt##_ossl_(void)             \
+    {                                             \
+        init##_ossl_ret_ = initalt();             \
+    }                                             \
+    static int initalt(void)
+
+/*
+ * RUN_ONCE - use CRYPTO_THREAD_run_once, and check if the init succeeded
+ * @once: pointer to static object of type CRYPTO_ONCE
+ * @init: function name that was previously given to DEFINE_RUN_ONCE,
+ *        DEFINE_RUN_ONCE_STATIC or DECLARE_RUN_ONCE.  This function
+ *        must return 1 for success or 0 for failure.
+ *
+ * The return value is 1 on success (*) or 0 in case of error.
+ *
+ * (*) by convention, since the init function must return 1 on success.
+ */
+#define RUN_ONCE(once, init)                                            \
+    (CRYPTO_THREAD_run_once(once, init##_ossl_) ? init##_ossl_ret_ : 0)
+
+/*
+ * RUN_ONCE_ALT - use CRYPTO_THREAD_run_once, to run an alternative initialiser
+ *                function and check if that initialisation succeeded
+ * @once:    pointer to static object of type CRYPTO_ONCE
+ * @initalt: alternative initialiser function name that was previously given to
+ *           DEFINE_RUN_ONCE_STATIC_ALT.  This function must return 1 for
+ *           success or 0 for failure.
+ * @init:    primary initialiser function name that was previously given to
+ *           DEFINE_RUN_ONCE_STATIC.  This function must return 1 for success or
+ *           0 for failure.
+ *
+ * The return value is 1 on success (*) or 0 in case of error.
+ *
+ * (*) by convention, since the init function must return 1 on success.
+ */
+#define RUN_ONCE_ALT(once, initalt, init)                               \
+    (CRYPTO_THREAD_run_once(once, initalt##_ossl_) ? init##_ossl_ret_ : 0)
diff --git a/openssl-1.1.1a-clang/include/internal/tsan_assist.h b/openssl-1.1.1d-clang/include/internal/tsan_assist.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/internal/tsan_assist.h
rename to openssl-1.1.1d-clang/include/internal/tsan_assist.h
index f30ffe3..cc30162 100644
--- a/openssl-1.1.1a-clang/include/internal/tsan_assist.h
+++ b/openssl-1.1.1d-clang/include/internal/tsan_assist.h
@@ -1,12 +1,12 @@
 /*
- * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2019 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
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
- 
+
 /*
  * Contemporary compilers implement lock-free atomic memory access
  * primitives that facilitate writing "thread-opportunistic" or even real
@@ -18,7 +18,7 @@
  * if (var == NOT_YET_INITIALIZED)
  *     var = function_returning_same_value();
  *
- * This does work provided that loads and stores are single-instuction
+ * This does work provided that loads and stores are single-instruction
  * operations (and integer ones are on *all* supported platforms), but
  * it upsets Thread Sanitizer. Suggested solution is
  *
@@ -77,7 +77,7 @@
 
 #elif defined(_MSC_VER) && _MSC_VER>=1200 \
       && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \
-          defined(_M_ARM64) || (defined(_M_ARM) && _M_ARM >= 7))
+          defined(_M_ARM64) || (defined(_M_ARM) && _M_ARM >= 7 && !defined(_WIN32_WCE)))
 /*
  * There is subtle dependency on /volatile:<iso|ms> command-line option.
  * "ms" implies same semantic as memory_order_acquire for loads and
diff --git a/openssl-1.1.1a-clang/include/openssl/__DECC_INCLUDE_EPILOGUE.H b/openssl-1.1.1d-clang/include/openssl/__DECC_INCLUDE_EPILOGUE.H
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/__DECC_INCLUDE_EPILOGUE.H
rename to openssl-1.1.1d-clang/include/openssl/__DECC_INCLUDE_EPILOGUE.H
diff --git a/openssl-1.1.1a-clang/include/openssl/__DECC_INCLUDE_PROLOGUE.H b/openssl-1.1.1d-clang/include/openssl/__DECC_INCLUDE_PROLOGUE.H
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/__DECC_INCLUDE_PROLOGUE.H
rename to openssl-1.1.1d-clang/include/openssl/__DECC_INCLUDE_PROLOGUE.H
diff --git a/openssl-1.1.1a-clang/include/openssl/aes.h b/openssl-1.1.1d-clang/include/openssl/aes.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/aes.h
rename to openssl-1.1.1d-clang/include/openssl/aes.h
diff --git a/openssl-1.1.1a-clang/include/openssl/asn1.h b/openssl-1.1.1d-clang/include/openssl/asn1.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/asn1.h
rename to openssl-1.1.1d-clang/include/openssl/asn1.h
diff --git a/openssl-1.1.1a-clang/include/openssl/asn1_mac.h b/openssl-1.1.1d-clang/include/openssl/asn1_mac.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/asn1_mac.h
rename to openssl-1.1.1d-clang/include/openssl/asn1_mac.h
diff --git a/openssl-1.1.1a-clang/include/openssl/asn1err.h b/openssl-1.1.1d-clang/include/openssl/asn1err.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/asn1err.h
rename to openssl-1.1.1d-clang/include/openssl/asn1err.h
index 5a91126..faed5a5 100644
--- a/openssl-1.1.1a-clang/include/openssl/asn1err.h
+++ b/openssl-1.1.1d-clang/include/openssl/asn1err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_ASN1ERR_H
 # define HEADER_ASN1ERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/asn1t.h b/openssl-1.1.1d-clang/include/openssl/asn1t.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/asn1t.h
rename to openssl-1.1.1d-clang/include/openssl/asn1t.h
diff --git a/openssl-1.1.1a-clang/include/openssl/async.h b/openssl-1.1.1d-clang/include/openssl/async.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/async.h
rename to openssl-1.1.1d-clang/include/openssl/async.h
diff --git a/openssl-1.1.1a-clang/include/openssl/asyncerr.h b/openssl-1.1.1d-clang/include/openssl/asyncerr.h
similarity index 90%
rename from openssl-1.1.1a-clang/include/openssl/asyncerr.h
rename to openssl-1.1.1d-clang/include/openssl/asyncerr.h
index 5497ba7..91afbbb 100644
--- a/openssl-1.1.1a-clang/include/openssl/asyncerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/asyncerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_ASYNCERR_H
 # define HEADER_ASYNCERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/bio.h b/openssl-1.1.1d-clang/include/openssl/bio.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/bio.h
rename to openssl-1.1.1d-clang/include/openssl/bio.h
index 2888b42..e1fddfb 100644
--- a/openssl-1.1.1a-clang/include/openssl/bio.h
+++ b/openssl-1.1.1d-clang/include/openssl/bio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -20,10 +20,6 @@
 # include <openssl/crypto.h>
 # include <openssl/bioerr.h>
 
-# ifndef OPENSSL_NO_SCTP
-#  include <openssl/e_os2.h>
-# endif
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff --git a/openssl-1.1.1a-clang/include/openssl/bioerr.h b/openssl-1.1.1d-clang/include/openssl/bioerr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/bioerr.h
rename to openssl-1.1.1d-clang/include/openssl/bioerr.h
index f119a59..46e2c96 100644
--- a/openssl-1.1.1a-clang/include/openssl/bioerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/bioerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_BIOERR_H
 # define HEADER_BIOERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/blowfish.h b/openssl-1.1.1d-clang/include/openssl/blowfish.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/blowfish.h
rename to openssl-1.1.1d-clang/include/openssl/blowfish.h
diff --git a/openssl-1.1.1a-clang/include/openssl/bn.h b/openssl-1.1.1d-clang/include/openssl/bn.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/bn.h
rename to openssl-1.1.1d-clang/include/openssl/bn.h
diff --git a/openssl-1.1.1a-clang/include/openssl/bnerr.h b/openssl-1.1.1d-clang/include/openssl/bnerr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/bnerr.h
rename to openssl-1.1.1d-clang/include/openssl/bnerr.h
index 8a022cc..9f3c7cf 100644
--- a/openssl-1.1.1a-clang/include/openssl/bnerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/bnerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_BNERR_H
 # define HEADER_BNERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/buffer.h b/openssl-1.1.1d-clang/include/openssl/buffer.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/buffer.h
rename to openssl-1.1.1d-clang/include/openssl/buffer.h
diff --git a/openssl-1.1.1a-clang/include/openssl/buffererr.h b/openssl-1.1.1d-clang/include/openssl/buffererr.h
similarity index 83%
rename from openssl-1.1.1a-clang/include/openssl/buffererr.h
rename to openssl-1.1.1d-clang/include/openssl/buffererr.h
index 3aee132..04f6ff7 100644
--- a/openssl-1.1.1a-clang/include/openssl/buffererr.h
+++ b/openssl-1.1.1d-clang/include/openssl/buffererr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_BUFERR_H
 # define HEADER_BUFERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/camellia.h b/openssl-1.1.1d-clang/include/openssl/camellia.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/camellia.h
rename to openssl-1.1.1d-clang/include/openssl/camellia.h
diff --git a/openssl-1.1.1a-clang/include/openssl/cast.h b/openssl-1.1.1d-clang/include/openssl/cast.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/cast.h
rename to openssl-1.1.1d-clang/include/openssl/cast.h
diff --git a/openssl-1.1.1a-clang/include/openssl/cmac.h b/openssl-1.1.1d-clang/include/openssl/cmac.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/cmac.h
rename to openssl-1.1.1d-clang/include/openssl/cmac.h
diff --git a/openssl-1.1.1a-clang/include/openssl/cms.h b/openssl-1.1.1d-clang/include/openssl/cms.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/cms.h
rename to openssl-1.1.1d-clang/include/openssl/cms.h
index ddf37e5..c762796 100644
--- a/openssl-1.1.1a-clang/include/openssl/cms.h
+++ b/openssl-1.1.1d-clang/include/openssl/cms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2019 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
@@ -284,8 +284,6 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
 void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
                                     int lastpos, int type);
 
-# ifdef HEADER_X509V3_H
-
 int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
 CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
                                                int allorfirst,
@@ -298,7 +296,6 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
                                     int *pallorfirst,
                                     STACK_OF(GENERAL_NAMES) **plist,
                                     STACK_OF(GENERAL_NAMES) **prto);
-# endif
 int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
                                     X509_ALGOR **palg,
                                     ASN1_OCTET_STRING **pukm);
diff --git a/openssl-1.1.1a-clang/include/openssl/cmserr.h b/openssl-1.1.1d-clang/include/openssl/cmserr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/cmserr.h
rename to openssl-1.1.1d-clang/include/openssl/cmserr.h
index 3f8ae26..7dbc13d 100644
--- a/openssl-1.1.1a-clang/include/openssl/cmserr.h
+++ b/openssl-1.1.1d-clang/include/openssl/cmserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_CMSERR_H
 # define HEADER_CMSERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_CMS
@@ -101,6 +105,7 @@ int ERR_load_CMS_strings(void);
 #  define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 153
 #  define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              154
 #  define CMS_F_CMS_SIGN_RECEIPT                           163
+#  define CMS_F_CMS_SI_CHECK_ATTRIBUTES                    183
 #  define CMS_F_CMS_STREAM                                 155
 #  define CMS_F_CMS_UNCOMPRESS                             156
 #  define CMS_F_CMS_VERIFY                                 157
@@ -110,6 +115,7 @@ int ERR_load_CMS_strings(void);
  * CMS reason codes.
  */
 #  define CMS_R_ADD_SIGNER_ERROR                           99
+#  define CMS_R_ATTRIBUTE_ERROR                            161
 #  define CMS_R_CERTIFICATE_ALREADY_PRESENT                175
 #  define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160
 #  define CMS_R_CERTIFICATE_VERIFY_ERROR                   100
diff --git a/openssl-1.1.1a-clang/include/openssl/comp.h b/openssl-1.1.1d-clang/include/openssl/comp.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/comp.h
rename to openssl-1.1.1d-clang/include/openssl/comp.h
diff --git a/openssl-1.1.1a-clang/include/openssl/comperr.h b/openssl-1.1.1d-clang/include/openssl/comperr.h
similarity index 89%
rename from openssl-1.1.1a-clang/include/openssl/comperr.h
rename to openssl-1.1.1d-clang/include/openssl/comperr.h
index edea63a..90231e9 100644
--- a/openssl-1.1.1a-clang/include/openssl/comperr.h
+++ b/openssl-1.1.1d-clang/include/openssl/comperr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_COMPERR_H
 # define HEADER_COMPERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_COMP
diff --git a/openssl-1.1.1a-clang/include/openssl/conf.h b/openssl-1.1.1d-clang/include/openssl/conf.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/conf.h
rename to openssl-1.1.1d-clang/include/openssl/conf.h
diff --git a/openssl-1.1.1a-clang/include/openssl/conf_api.h b/openssl-1.1.1d-clang/include/openssl/conf_api.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/conf_api.h
rename to openssl-1.1.1d-clang/include/openssl/conf_api.h
diff --git a/openssl-1.1.1a-clang/include/openssl/conferr.h b/openssl-1.1.1d-clang/include/openssl/conferr.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/conferr.h
rename to openssl-1.1.1d-clang/include/openssl/conferr.h
index d1c92f4..32b9229 100644
--- a/openssl-1.1.1a-clang/include/openssl/conferr.h
+++ b/openssl-1.1.1d-clang/include/openssl/conferr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_CONFERR_H
 # define HEADER_CONFERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/crypto.h b/openssl-1.1.1d-clang/include/openssl/crypto.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/crypto.h
rename to openssl-1.1.1d-clang/include/openssl/crypto.h
index 7e50b1b..7d0b526 100644
--- a/openssl-1.1.1a-clang/include/openssl/crypto.h
+++ b/openssl-1.1.1d-clang/include/openssl/crypto.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -109,13 +109,8 @@ DEFINE_STACK_OF(void)
 # define CRYPTO_EX_INDEX_DRBG            15
 # define CRYPTO_EX_INDEX__COUNT          16
 
-/*
- * This is the default callbacks, but we can have others as well: this is
- * needed in Win32 where the application malloc and the library malloc may
- * not be the same.
- */
-#define OPENSSL_malloc_init() \
-    CRYPTO_set_mem_functions(CRYPTO_malloc, CRYPTO_realloc, CRYPTO_free)
+/* No longer needed, so this is a no-op */
+#define OPENSSL_malloc_init() while(0) continue
 
 int CRYPTO_mem_ctrl(int mode);
 
@@ -377,6 +372,7 @@ int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
 /* OPENSSL_INIT_ZLIB                         0x00010000L */
 # define OPENSSL_INIT_ATFORK                 0x00020000L
 /* OPENSSL_INIT_BASE_ONLY                    0x00040000L */
+# define OPENSSL_INIT_NO_ATEXIT              0x00080000L
 /* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */
 /* Max OPENSSL_INIT flag value is 0x80000000 */
 
@@ -396,8 +392,12 @@ void OPENSSL_thread_stop(void);
 /* Low-level control of initialization */
 OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void);
 # ifndef OPENSSL_NO_STDIO
+int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
+                                     const char *config_filename);
+void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings,
+                                        unsigned long flags);
 int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
-                                    const char *config_file);
+                                    const char *config_appname);
 # endif
 void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings);
 
diff --git a/openssl-1.1.1a-clang/include/openssl/cryptoerr.h b/openssl-1.1.1d-clang/include/openssl/cryptoerr.h
similarity index 94%
rename from openssl-1.1.1a-clang/include/openssl/cryptoerr.h
rename to openssl-1.1.1d-clang/include/openssl/cryptoerr.h
index 10723d0..3db5a4e 100644
--- a/openssl-1.1.1a-clang/include/openssl/cryptoerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/cryptoerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,12 +11,13 @@
 #ifndef HEADER_CRYPTOERR_H
 # define HEADER_CRYPTOERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
-
-# include <openssl/symhacks.h>
-
 int ERR_load_CRYPTO_strings(void);
 
 /*
diff --git a/openssl-1.1.1a-clang/include/openssl/ct.h b/openssl-1.1.1d-clang/include/openssl/ct.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ct.h
rename to openssl-1.1.1d-clang/include/openssl/ct.h
diff --git a/openssl-1.1.1a-clang/include/openssl/cterr.h b/openssl-1.1.1d-clang/include/openssl/cterr.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/cterr.h
rename to openssl-1.1.1d-clang/include/openssl/cterr.h
index 764e1a2..feb7bc5 100644
--- a/openssl-1.1.1a-clang/include/openssl/cterr.h
+++ b/openssl-1.1.1d-clang/include/openssl/cterr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_CTERR_H
 # define HEADER_CTERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_CT
diff --git a/openssl-1.1.1a-clang/include/openssl/des.h b/openssl-1.1.1d-clang/include/openssl/des.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/des.h
rename to openssl-1.1.1d-clang/include/openssl/des.h
diff --git a/openssl-1.1.1a-clang/include/openssl/dh.h b/openssl-1.1.1d-clang/include/openssl/dh.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/dh.h
rename to openssl-1.1.1d-clang/include/openssl/dh.h
diff --git a/openssl-1.1.1a-clang/include/openssl/dherr.h b/openssl-1.1.1d-clang/include/openssl/dherr.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/dherr.h
rename to openssl-1.1.1d-clang/include/openssl/dherr.h
index 81e73f7..916b3be 100644
--- a/openssl-1.1.1a-clang/include/openssl/dherr.h
+++ b/openssl-1.1.1d-clang/include/openssl/dherr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_DHERR_H
 # define HEADER_DHERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_DH
diff --git a/openssl-1.1.1a-clang/include/openssl/dsa.h b/openssl-1.1.1d-clang/include/openssl/dsa.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/dsa.h
rename to openssl-1.1.1d-clang/include/openssl/dsa.h
diff --git a/openssl-1.1.1a-clang/include/openssl/dsaerr.h b/openssl-1.1.1d-clang/include/openssl/dsaerr.h
similarity index 93%
rename from openssl-1.1.1a-clang/include/openssl/dsaerr.h
rename to openssl-1.1.1d-clang/include/openssl/dsaerr.h
index d94f97b..495a1ac 100644
--- a/openssl-1.1.1a-clang/include/openssl/dsaerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/dsaerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_DSAERR_H
 # define HEADER_DSAERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_DSA
@@ -57,6 +61,7 @@ int ERR_load_DSA_strings(void);
 #  define DSA_R_INVALID_DIGEST_TYPE                        106
 #  define DSA_R_INVALID_PARAMETERS                         112
 #  define DSA_R_MISSING_PARAMETERS                         101
+#  define DSA_R_MISSING_PRIVATE_KEY                        111
 #  define DSA_R_MODULUS_TOO_LARGE                          103
 #  define DSA_R_NO_PARAMETERS_SET                          107
 #  define DSA_R_PARAMETER_ENCODING_ERROR                   105
diff --git a/openssl-1.1.1a-clang/include/openssl/dtls1.h b/openssl-1.1.1d-clang/include/openssl/dtls1.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/dtls1.h
rename to openssl-1.1.1d-clang/include/openssl/dtls1.h
diff --git a/openssl-1.1.1a-clang/include/openssl/e_os2.h b/openssl-1.1.1d-clang/include/openssl/e_os2.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/e_os2.h
rename to openssl-1.1.1d-clang/include/openssl/e_os2.h
index eeae215..97a776c 100644
--- a/openssl-1.1.1a-clang/include/openssl/e_os2.h
+++ b/openssl-1.1.1d-clang/include/openssl/e_os2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -287,6 +287,13 @@ typedef unsigned __int64 uint64_t;
 #  define ossl_noreturn
 # endif
 
+/* ossl_unused: portable unused attribute for use in public headers */
+# if defined(__GNUC__)
+#  define ossl_unused __attribute__((unused))
+# else
+#  define ossl_unused
+# endif
+
 #ifdef  __cplusplus
 }
 #endif
diff --git a/openssl-1.1.1a-clang/include/openssl/ebcdic.h b/openssl-1.1.1d-clang/include/openssl/ebcdic.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ebcdic.h
rename to openssl-1.1.1d-clang/include/openssl/ebcdic.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ec.h b/openssl-1.1.1d-clang/include/openssl/ec.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/ec.h
rename to openssl-1.1.1d-clang/include/openssl/ec.h
index 347cfb6..5af9ebd 100644
--- a/openssl-1.1.1a-clang/include/openssl/ec.h
+++ b/openssl-1.1.1d-clang/include/openssl/ec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2019 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -142,7 +142,7 @@ const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
  */
 int EC_METHOD_get_field_type(const EC_METHOD *meth);
 
-/** Sets the generator and it's order/cofactor of a EC_GROUP object.
+/** Sets the generator and its order/cofactor of a EC_GROUP object.
  *  \param  group      EC_GROUP object
  *  \param  generator  EC_POINT object with the generator.
  *  \param  order      the order of the group generated by the generator.
@@ -1138,7 +1138,8 @@ void ECDSA_SIG_free(ECDSA_SIG *sig);
  *  (*pp += length of the DER encoded signature)).
  *  \param  sig  pointer to the ECDSA_SIG object
  *  \param  pp   pointer to a unsigned char pointer for the output or NULL
- *  \return the length of the DER encoded ECDSA_SIG object or 0
+ *  \return the length of the DER encoded ECDSA_SIG object or a negative value
+ *          on error
  */
 int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
 
diff --git a/openssl-1.1.1a-clang/include/openssl/ecdh.h b/openssl-1.1.1d-clang/include/openssl/ecdh.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ecdh.h
rename to openssl-1.1.1d-clang/include/openssl/ecdh.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ecdsa.h b/openssl-1.1.1d-clang/include/openssl/ecdsa.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ecdsa.h
rename to openssl-1.1.1d-clang/include/openssl/ecdsa.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ecerr.h b/openssl-1.1.1d-clang/include/openssl/ecerr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/ecerr.h
rename to openssl-1.1.1d-clang/include/openssl/ecerr.h
index 8d42938..f7b9183 100644
--- a/openssl-1.1.1a-clang/include/openssl/ecerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/ecerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_ECERR_H
 # define HEADER_ECERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_EC
@@ -62,6 +66,7 @@ int ERR_load_EC_strings(void);
 #  define EC_F_EC_ASN1_GROUP2CURVE                         153
 #  define EC_F_EC_ASN1_GROUP2FIELDID                       154
 #  define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY           208
+#  define EC_F_EC_GF2M_SIMPLE_FIELD_INV                    296
 #  define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT     159
 #  define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE              195
 #  define EC_F_EC_GF2M_SIMPLE_LADDER_POST                  285
@@ -74,6 +79,7 @@ int ERR_load_EC_strings(void);
 #  define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES   164
 #  define EC_F_EC_GFP_MONT_FIELD_DECODE                    133
 #  define EC_F_EC_GFP_MONT_FIELD_ENCODE                    134
+#  define EC_F_EC_GFP_MONT_FIELD_INV                       297
 #  define EC_F_EC_GFP_MONT_FIELD_MUL                       131
 #  define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE                209
 #  define EC_F_EC_GFP_MONT_FIELD_SQR                       132
@@ -91,6 +97,7 @@ int ERR_load_EC_strings(void);
 #  define EC_F_EC_GFP_NIST_FIELD_SQR                       201
 #  define EC_F_EC_GFP_NIST_GROUP_SET_CURVE                 202
 #  define EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES             287
+#  define EC_F_EC_GFP_SIMPLE_FIELD_INV                     298
 #  define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT      165
 #  define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE               166
 #  define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE                   102
@@ -202,6 +209,7 @@ int ERR_load_EC_strings(void);
 #  define EC_R_BAD_SIGNATURE                               156
 #  define EC_R_BIGNUM_OUT_OF_RANGE                         144
 #  define EC_R_BUFFER_TOO_SMALL                            100
+#  define EC_R_CANNOT_INVERT                               165
 #  define EC_R_COORDINATES_OUT_OF_RANGE                    146
 #  define EC_R_CURVE_DOES_NOT_SUPPORT_ECDH                 160
 #  define EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING              159
diff --git a/openssl-1.1.1a-clang/include/openssl/engine.h b/openssl-1.1.1d-clang/include/openssl/engine.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/engine.h
rename to openssl-1.1.1d-clang/include/openssl/engine.h
diff --git a/openssl-1.1.1a-clang/include/openssl/engineerr.h b/openssl-1.1.1d-clang/include/openssl/engineerr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/engineerr.h
rename to openssl-1.1.1d-clang/include/openssl/engineerr.h
index b4c036b..05e84bd 100644
--- a/openssl-1.1.1a-clang/include/openssl/engineerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/engineerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_ENGINEERR_H
 # define HEADER_ENGINEERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_ENGINE
diff --git a/openssl-1.1.1a-clang/include/openssl/err.h b/openssl-1.1.1d-clang/include/openssl/err.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/err.h
rename to openssl-1.1.1d-clang/include/openssl/err.h
index 6cae1a3..b49f881 100644
--- a/openssl-1.1.1a-clang/include/openssl/err.h
+++ b/openssl-1.1.1d-clang/include/openssl/err.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -37,6 +37,7 @@ extern "C" {
 # define ERR_TXT_STRING          0x02
 
 # define ERR_FLAG_MARK           0x01
+# define ERR_FLAG_CLEAR          0x02
 
 # define ERR_NUM_ERRORS  16
 typedef struct err_state_st {
diff --git a/openssl-1.1.1a-clang/include/openssl/evp.h b/openssl-1.1.1d-clang/include/openssl/evp.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/evp.h
rename to openssl-1.1.1d-clang/include/openssl/evp.h
index 8c80519..545654a 100644
--- a/openssl-1.1.1a-clang/include/openssl/evp.h
+++ b/openssl-1.1.1d-clang/include/openssl/evp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -260,6 +260,8 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
 # define         EVP_CIPH_RAND_KEY               0x200
 /* cipher has its own additional copying logic */
 # define         EVP_CIPH_CUSTOM_COPY            0x400
+/* Don't use standard iv length function */
+# define         EVP_CIPH_CUSTOM_IV_LENGTH       0x800
 /* Allow use default ASN1 get/set iv */
 # define         EVP_CIPH_FLAG_DEFAULT_ASN1      0x1000
 /* Buffer length in bits not bytes: CFB1 mode only */
@@ -349,6 +351,8 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
 /* Set the input buffer lengths to use for a pipelined operation */
 # define         EVP_CTRL_SET_PIPELINE_INPUT_LENS        0x24
 
+# define         EVP_CTRL_GET_IVLEN                      0x25
+
 /* Padding modes */
 #define EVP_PADDING_PKCS7       1
 #define EVP_PADDING_ISO7816_4   2
@@ -945,14 +949,9 @@ const EVP_CIPHER *EVP_sm4_ctr(void);
                         | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
 
 #  ifdef OPENSSL_LOAD_CONF
-#   define OpenSSL_add_all_algorithms() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS \
-                        | OPENSSL_INIT_LOAD_CONFIG, NULL)
+#   define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_conf()
 #  else
-#   define OpenSSL_add_all_algorithms() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+#   define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_noconf()
 #  endif
 
 #  define OpenSSL_add_all_ciphers() \
@@ -994,12 +993,13 @@ int EVP_PKEY_id(const EVP_PKEY *pkey);
 int EVP_PKEY_base_id(const EVP_PKEY *pkey);
 int EVP_PKEY_bits(const EVP_PKEY *pkey);
 int EVP_PKEY_security_bits(const EVP_PKEY *pkey);
-int EVP_PKEY_size(EVP_PKEY *pkey);
+int EVP_PKEY_size(const EVP_PKEY *pkey);
 int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
 int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
 int EVP_PKEY_set_alias_type(EVP_PKEY *pkey, int type);
 # ifndef OPENSSL_NO_ENGINE
 int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e);
+ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey);
 # endif
 int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
 void *EVP_PKEY_get0(const EVP_PKEY *pkey);
diff --git a/openssl-1.1.1a-clang/include/openssl/evperr.h b/openssl-1.1.1d-clang/include/openssl/evperr.h
similarity index 95%
rename from openssl-1.1.1a-clang/include/openssl/evperr.h
rename to openssl-1.1.1d-clang/include/openssl/evperr.h
index 3484fa8..6a651f5 100644
--- a/openssl-1.1.1a-clang/include/openssl/evperr.h
+++ b/openssl-1.1.1d-clang/include/openssl/evperr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_EVPERR_H
 # define HEADER_EVPERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
@@ -20,11 +24,14 @@ int ERR_load_EVP_strings(void);
  * EVP function codes.
  */
 # define EVP_F_AESNI_INIT_KEY                             165
+# define EVP_F_AESNI_XTS_INIT_KEY                         207
 # define EVP_F_AES_GCM_CTRL                               196
 # define EVP_F_AES_INIT_KEY                               133
 # define EVP_F_AES_OCB_CIPHER                             169
 # define EVP_F_AES_T4_INIT_KEY                            178
+# define EVP_F_AES_T4_XTS_INIT_KEY                        208
 # define EVP_F_AES_WRAP_CIPHER                            170
+# define EVP_F_AES_XTS_INIT_KEY                           209
 # define EVP_F_ALG_MODULE_INIT                            177
 # define EVP_F_ARIA_CCM_INIT_KEY                          175
 # define EVP_F_ARIA_GCM_CTRL                              197
@@ -47,6 +54,7 @@ int ERR_load_EVP_strings(void);
 # define EVP_F_EVP_DECRYPTUPDATE                          166
 # define EVP_F_EVP_DIGESTFINALXOF                         174
 # define EVP_F_EVP_DIGESTINIT_EX                          128
+# define EVP_F_EVP_ENCRYPTDECRYPTUPDATE                   219
 # define EVP_F_EVP_ENCRYPTFINAL_EX                        127
 # define EVP_F_EVP_ENCRYPTUPDATE                          167
 # define EVP_F_EVP_MD_CTX_COPY_EX                         110
@@ -114,6 +122,7 @@ int ERR_load_EVP_strings(void);
 # define EVP_F_PKEY_SET_TYPE                              158
 # define EVP_F_RC2_MAGIC_TO_METH                          109
 # define EVP_F_RC5_CTRL                                   125
+# define EVP_F_R_32_12_16_INIT_KEY                        242
 # define EVP_F_S390X_AES_GCM_CTRL                         201
 # define EVP_F_UPDATE                                     173
 
@@ -123,6 +132,7 @@ int ERR_load_EVP_strings(void);
 # define EVP_R_AES_KEY_SETUP_FAILED                       143
 # define EVP_R_ARIA_KEY_SETUP_FAILED                      176
 # define EVP_R_BAD_DECRYPT                                100
+# define EVP_R_BAD_KEY_LENGTH                             195
 # define EVP_R_BUFFER_TOO_SMALL                           155
 # define EVP_R_CAMELLIA_KEY_SETUP_FAILED                  157
 # define EVP_R_CIPHER_PARAMETER_ERROR                     122
@@ -189,5 +199,6 @@ int ERR_load_EVP_strings(void);
 # define EVP_R_UNSUPPORTED_SALT_TYPE                      126
 # define EVP_R_WRAP_MODE_NOT_ALLOWED                      170
 # define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   109
+# define EVP_R_XTS_DUPLICATED_KEYS                        183
 
 #endif
diff --git a/openssl-1.1.1a-clang/include/openssl/hmac.h b/openssl-1.1.1d-clang/include/openssl/hmac.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/hmac.h
rename to openssl-1.1.1d-clang/include/openssl/hmac.h
diff --git a/openssl-1.1.1a-clang/include/openssl/idea.h b/openssl-1.1.1d-clang/include/openssl/idea.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/idea.h
rename to openssl-1.1.1d-clang/include/openssl/idea.h
diff --git a/openssl-1.1.1a-clang/include/openssl/kdf.h b/openssl-1.1.1d-clang/include/openssl/kdf.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/kdf.h
rename to openssl-1.1.1d-clang/include/openssl/kdf.h
diff --git a/openssl-1.1.1a-clang/include/openssl/kdferr.h b/openssl-1.1.1d-clang/include/openssl/kdferr.h
similarity index 93%
rename from openssl-1.1.1a-clang/include/openssl/kdferr.h
rename to openssl-1.1.1d-clang/include/openssl/kdferr.h
index 6437c27..3f51bd0 100644
--- a/openssl-1.1.1a-clang/include/openssl/kdferr.h
+++ b/openssl-1.1.1d-clang/include/openssl/kdferr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_KDFERR_H
 # define HEADER_KDFERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/lhash.h b/openssl-1.1.1d-clang/include/openssl/lhash.h
similarity index 75%
rename from openssl-1.1.1a-clang/include/openssl/lhash.h
rename to openssl-1.1.1d-clang/include/openssl/lhash.h
index 88d7d97..47b99d1 100644
--- a/openssl-1.1.1a-clang/include/openssl/lhash.h
+++ b/openssl-1.1.1d-clang/include/openssl/lhash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -127,52 +127,52 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
         return (LHASH_OF(type) *) \
             OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
     } \
-    static ossl_inline void lh_##type##_free(LHASH_OF(type) *lh) \
+    static ossl_unused ossl_inline void lh_##type##_free(LHASH_OF(type) *lh) \
     { \
         OPENSSL_LH_free((OPENSSL_LHASH *)lh); \
     } \
-    static ossl_inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
+    static ossl_unused ossl_inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
     { \
         return (type *)OPENSSL_LH_insert((OPENSSL_LHASH *)lh, d); \
     } \
-    static ossl_inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
+    static ossl_unused ossl_inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
     { \
         return (type *)OPENSSL_LH_delete((OPENSSL_LHASH *)lh, d); \
     } \
-    static ossl_inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
+    static ossl_unused ossl_inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
     { \
         return (type *)OPENSSL_LH_retrieve((OPENSSL_LHASH *)lh, d); \
     } \
-    static ossl_inline int lh_##type##_error(LHASH_OF(type) *lh) \
+    static ossl_unused ossl_inline int lh_##type##_error(LHASH_OF(type) *lh) \
     { \
         return OPENSSL_LH_error((OPENSSL_LHASH *)lh); \
     } \
-    static ossl_inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \
+    static ossl_unused ossl_inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \
     { \
         return OPENSSL_LH_num_items((OPENSSL_LHASH *)lh); \
     } \
-    static ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
+    static ossl_unused ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
     { \
         OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
     } \
-    static ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
+    static ossl_unused ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
     { \
         OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
     } \
-    static ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
+    static ossl_unused ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
     { \
         OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
     } \
-    static ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \
+    static ossl_unused ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \
     { \
         return OPENSSL_LH_get_down_load((OPENSSL_LHASH *)lh); \
     } \
-    static ossl_inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
+    static ossl_unused ossl_inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
     { \
         OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
     } \
-    static ossl_inline void lh_##type##_doall(LHASH_OF(type) *lh, \
-                                         void (*doall)(type *)) \
+    static ossl_unused ossl_inline void lh_##type##_doall(LHASH_OF(type) *lh, \
+                                                          void (*doall)(type *)) \
     { \
         OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
     } \
@@ -185,7 +185,7 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
     int_implement_lhash_doall(type, argtype, type)
 
 #define int_implement_lhash_doall(type, argtype, cbargtype) \
-    static ossl_inline void \
+    static ossl_unused ossl_inline void \
         lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
                                    void (*fn)(cbargtype *, argtype *), \
                                    argtype *arg) \
@@ -210,6 +210,31 @@ DEFINE_LHASH_OF(OPENSSL_CSTRING);
 #  pragma warning (pop)
 # endif
 
+/*
+ * If called without higher optimization (min. -xO3) the Oracle Developer
+ * Studio compiler generates code for the defined (static inline) functions
+ * above.
+ * This would later lead to the linker complaining about missing symbols when
+ * this header file is included but the resulting object is not linked against
+ * the Crypto library (openssl#6912).
+ */
+# ifdef __SUNPRO_C
+#  pragma weak OPENSSL_LH_new
+#  pragma weak OPENSSL_LH_free
+#  pragma weak OPENSSL_LH_insert
+#  pragma weak OPENSSL_LH_delete
+#  pragma weak OPENSSL_LH_retrieve
+#  pragma weak OPENSSL_LH_error
+#  pragma weak OPENSSL_LH_num_items
+#  pragma weak OPENSSL_LH_node_stats_bio
+#  pragma weak OPENSSL_LH_node_usage_stats_bio
+#  pragma weak OPENSSL_LH_stats_bio
+#  pragma weak OPENSSL_LH_get_down_load
+#  pragma weak OPENSSL_LH_set_down_load
+#  pragma weak OPENSSL_LH_doall
+#  pragma weak OPENSSL_LH_doall_arg
+# endif /* __SUNPRO_C */
+
 #ifdef  __cplusplus
 }
 #endif
diff --git a/openssl-1.1.1a-clang/include/openssl/md2.h b/openssl-1.1.1d-clang/include/openssl/md2.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/md2.h
rename to openssl-1.1.1d-clang/include/openssl/md2.h
diff --git a/openssl-1.1.1a-clang/include/openssl/md4.h b/openssl-1.1.1d-clang/include/openssl/md4.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/md4.h
rename to openssl-1.1.1d-clang/include/openssl/md4.h
diff --git a/openssl-1.1.1a-clang/include/openssl/md5.h b/openssl-1.1.1d-clang/include/openssl/md5.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/md5.h
rename to openssl-1.1.1d-clang/include/openssl/md5.h
diff --git a/openssl-1.1.1a-clang/include/openssl/mdc2.h b/openssl-1.1.1d-clang/include/openssl/mdc2.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/mdc2.h
rename to openssl-1.1.1d-clang/include/openssl/mdc2.h
diff --git a/openssl-1.1.1a-clang/include/openssl/modes.h b/openssl-1.1.1d-clang/include/openssl/modes.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/modes.h
rename to openssl-1.1.1d-clang/include/openssl/modes.h
diff --git a/openssl-1.1.1a-clang/include/openssl/obj_mac.h b/openssl-1.1.1d-clang/include/openssl/obj_mac.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/obj_mac.h
rename to openssl-1.1.1d-clang/include/openssl/obj_mac.h
index 80ff5a7..47dafe4 100644
--- a/openssl-1.1.1a-clang/include/openssl/obj_mac.h
+++ b/openssl-1.1.1d-clang/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2019 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
  * in the file LICENSE in the source distribution or at
@@ -4280,7 +4280,7 @@
 
 #define SN_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15                "id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15"
 #define NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15               1183
-#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15               OBJ_id_tc26_wrap_gostr3412_2015_magma,1L
+#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15               OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik,1L
 
 #define SN_id_tc26_constants            "id-tc26-constants"
 #define NID_id_tc26_constants           994
diff --git a/openssl-1.1.1a-clang/include/openssl/objects.h b/openssl-1.1.1d-clang/include/openssl/objects.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/objects.h
rename to openssl-1.1.1d-clang/include/openssl/objects.h
diff --git a/openssl-1.1.1a-clang/include/openssl/objectserr.h b/openssl-1.1.1d-clang/include/openssl/objectserr.h
similarity index 89%
rename from openssl-1.1.1a-clang/include/openssl/objectserr.h
rename to openssl-1.1.1d-clang/include/openssl/objectserr.h
index 02308df..02e166f 100644
--- a/openssl-1.1.1a-clang/include/openssl/objectserr.h
+++ b/openssl-1.1.1d-clang/include/openssl/objectserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_OBJERR_H
 # define HEADER_OBJERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/ocsp.h b/openssl-1.1.1d-clang/include/openssl/ocsp.h
similarity index 98%
rename from openssl-1.1.1a-clang/include/openssl/ocsp.h
rename to openssl-1.1.1d-clang/include/openssl/ocsp.h
index 0a17166..8582fe1 100644
--- a/openssl-1.1.1a-clang/include/openssl/ocsp.h
+++ b/openssl-1.1.1d-clang/include/openssl/ocsp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2019 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
@@ -229,8 +229,8 @@ int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
 int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
                    int *pssl);
 
-int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
+int OCSP_id_issuer_cmp(const OCSP_CERTID *a, const OCSP_CERTID *b);
+int OCSP_id_cmp(const OCSP_CERTID *a, const OCSP_CERTID *b);
 
 int OCSP_request_onereq_count(OCSP_REQUEST *req);
 OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
diff --git a/openssl-1.1.1a-clang/include/openssl/ocsperr.h b/openssl-1.1.1d-clang/include/openssl/ocsperr.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/ocsperr.h
rename to openssl-1.1.1d-clang/include/openssl/ocsperr.h
index 7d93b12..8dd9e01 100644
--- a/openssl-1.1.1a-clang/include/openssl/ocsperr.h
+++ b/openssl-1.1.1d-clang/include/openssl/ocsperr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_OCSPERR_H
 # define HEADER_OCSPERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_OCSP
diff --git a/openssl-1.1.1a-clang/include/openssl/opensslconf.h b/openssl-1.1.1d-clang/include/openssl/opensslconf.h
similarity index 95%
rename from openssl-1.1.1a-clang/include/openssl/opensslconf.h
rename to openssl-1.1.1d-clang/include/openssl/opensslconf.h
index 682db08..cb602ac 100644
--- a/openssl-1.1.1a-clang/include/openssl/opensslconf.h
+++ b/openssl-1.1.1d-clang/include/openssl/opensslconf.h
@@ -24,6 +24,9 @@ extern "C" {
  * OpenSSL was configured with the following options:
  */
 
+#ifndef OPENSSL_NO_COMP
+# define OPENSSL_NO_COMP
+#endif
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
@@ -36,6 +39,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
@@ -54,6 +60,9 @@ extern "C" {
 #ifndef OPENSSL_NO_EGD
 # define OPENSSL_NO_EGD
 #endif
+#ifndef OPENSSL_NO_ENGINE
+# define OPENSSL_NO_ENGINE
+#endif
 #ifndef OPENSSL_NO_EXTERNAL_TESTS
 # define OPENSSL_NO_EXTERNAL_TESTS
 #endif
@@ -66,6 +75,9 @@ extern "C" {
 #ifndef OPENSSL_NO_HEARTBEATS
 # define OPENSSL_NO_HEARTBEATS
 #endif
+#ifndef OPENSSL_NO_HW
+# define OPENSSL_NO_HW
+#endif
 #ifndef OPENSSL_NO_MSAN
 # define OPENSSL_NO_MSAN
 #endif
diff --git a/openssl-1.1.1a-clang/include/openssl/opensslconf.h.in b/openssl-1.1.1d-clang/include/openssl/opensslconf.h.in
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/opensslconf.h.in
rename to openssl-1.1.1d-clang/include/openssl/opensslconf.h.in
diff --git a/openssl-1.1.1a-clang/include/openssl/opensslv.h b/openssl-1.1.1d-clang/include/openssl/opensslv.h
similarity index 95%
rename from openssl-1.1.1a-clang/include/openssl/opensslv.h
rename to openssl-1.1.1d-clang/include/openssl/opensslv.h
index af7a3b5..c28e632 100644
--- a/openssl-1.1.1a-clang/include/openssl/opensslv.h
+++ b/openssl-1.1.1d-clang/include/openssl/opensslv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2019 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
@@ -39,8 +39,8 @@ 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  0x1010101fL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1a  20 Nov 2018"
+# define OPENSSL_VERSION_NUMBER  0x1010104fL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1d  10 Sep 2019"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)
diff --git a/openssl-1.1.1a-clang/include/openssl/ossl_typ.h b/openssl-1.1.1d-clang/include/openssl/ossl_typ.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ossl_typ.h
rename to openssl-1.1.1d-clang/include/openssl/ossl_typ.h
diff --git a/openssl-1.1.1a-clang/include/openssl/pem.h b/openssl-1.1.1d-clang/include/openssl/pem.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/pem.h
rename to openssl-1.1.1d-clang/include/openssl/pem.h
diff --git a/openssl-1.1.1a-clang/include/openssl/pem2.h b/openssl-1.1.1d-clang/include/openssl/pem2.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/pem2.h
rename to openssl-1.1.1d-clang/include/openssl/pem2.h
diff --git a/openssl-1.1.1a-clang/include/openssl/pemerr.h b/openssl-1.1.1d-clang/include/openssl/pemerr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/pemerr.h
rename to openssl-1.1.1d-clang/include/openssl/pemerr.h
index cd61b82..0c45918 100644
--- a/openssl-1.1.1a-clang/include/openssl/pemerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/pemerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_PEMERR_H
 # define HEADER_PEMERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/pkcs12.h b/openssl-1.1.1d-clang/include/openssl/pkcs12.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/pkcs12.h
rename to openssl-1.1.1d-clang/include/openssl/pkcs12.h
diff --git a/openssl-1.1.1a-clang/include/openssl/pkcs12err.h b/openssl-1.1.1d-clang/include/openssl/pkcs12err.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/pkcs12err.h
rename to openssl-1.1.1d-clang/include/openssl/pkcs12err.h
index c7184ff..eff5eb2 100644
--- a/openssl-1.1.1a-clang/include/openssl/pkcs12err.h
+++ b/openssl-1.1.1d-clang/include/openssl/pkcs12err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_PKCS12ERR_H
 # define HEADER_PKCS12ERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/pkcs7.h b/openssl-1.1.1d-clang/include/openssl/pkcs7.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/pkcs7.h
rename to openssl-1.1.1d-clang/include/openssl/pkcs7.h
diff --git a/openssl-1.1.1a-clang/include/openssl/pkcs7err.h b/openssl-1.1.1d-clang/include/openssl/pkcs7err.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/pkcs7err.h
rename to openssl-1.1.1d-clang/include/openssl/pkcs7err.h
index 0ba418d..02e0299 100644
--- a/openssl-1.1.1a-clang/include/openssl/pkcs7err.h
+++ b/openssl-1.1.1d-clang/include/openssl/pkcs7err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_PKCS7ERR_H
 # define HEADER_PKCS7ERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/rand.h b/openssl-1.1.1d-clang/include/openssl/rand.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/rand.h
rename to openssl-1.1.1d-clang/include/openssl/rand.h
diff --git a/openssl-1.1.1a-clang/include/openssl/rand_drbg.h b/openssl-1.1.1d-clang/include/openssl/rand_drbg.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/rand_drbg.h
rename to openssl-1.1.1d-clang/include/openssl/rand_drbg.h
diff --git a/openssl-1.1.1a-clang/include/openssl/randerr.h b/openssl-1.1.1d-clang/include/openssl/randerr.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/randerr.h
rename to openssl-1.1.1d-clang/include/openssl/randerr.h
index 599a2a1..70d1a17 100644
--- a/openssl-1.1.1a-clang/include/openssl/randerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/randerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,8 @@
 #ifndef HEADER_RANDERR_H
 # define HEADER_RANDERR_H
 
+# include <openssl/symhacks.h>
+
 # ifdef  __cplusplus
 extern "C"
 # endif
@@ -42,6 +44,7 @@ int ERR_load_RAND_strings(void);
 # define RAND_F_RAND_POOL_ADD_END                         114
 # define RAND_F_RAND_POOL_ATTACH                          124
 # define RAND_F_RAND_POOL_BYTES_NEEDED                    115
+# define RAND_F_RAND_POOL_GROW                            125
 # define RAND_F_RAND_POOL_NEW                             116
 # define RAND_F_RAND_WRITE_FILE                           112
 
diff --git a/openssl-1.1.1a-clang/include/openssl/rc2.h b/openssl-1.1.1d-clang/include/openssl/rc2.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/rc2.h
rename to openssl-1.1.1d-clang/include/openssl/rc2.h
diff --git a/openssl-1.1.1a-clang/include/openssl/rc4.h b/openssl-1.1.1d-clang/include/openssl/rc4.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/rc4.h
rename to openssl-1.1.1d-clang/include/openssl/rc4.h
diff --git a/openssl-1.1.1a-clang/include/openssl/rc5.h b/openssl-1.1.1d-clang/include/openssl/rc5.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/rc5.h
rename to openssl-1.1.1d-clang/include/openssl/rc5.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ripemd.h b/openssl-1.1.1d-clang/include/openssl/ripemd.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ripemd.h
rename to openssl-1.1.1d-clang/include/openssl/ripemd.h
diff --git a/openssl-1.1.1a-clang/include/openssl/rsa.h b/openssl-1.1.1d-clang/include/openssl/rsa.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/rsa.h
rename to openssl-1.1.1d-clang/include/openssl/rsa.h
diff --git a/openssl-1.1.1a-clang/include/openssl/rsaerr.h b/openssl-1.1.1d-clang/include/openssl/rsaerr.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/rsaerr.h
rename to openssl-1.1.1d-clang/include/openssl/rsaerr.h
index d5bc01c..59b15e1 100644
--- a/openssl-1.1.1a-clang/include/openssl/rsaerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/rsaerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_RSAERR_H
 # define HEADER_RSAERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
@@ -126,6 +130,7 @@ int ERR_load_RSA_strings(void);
 # define RSA_R_KEY_PRIME_NUM_INVALID                      165
 # define RSA_R_KEY_SIZE_TOO_SMALL                         120
 # define RSA_R_LAST_OCTET_INVALID                         134
+# define RSA_R_MISSING_PRIVATE_KEY                        179
 # define RSA_R_MGF1_DIGEST_NOT_ALLOWED                    152
 # define RSA_R_MODULUS_TOO_LARGE                          105
 # define RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R            168
diff --git a/openssl-1.1.1a-clang/include/openssl/safestack.h b/openssl-1.1.1d-clang/include/openssl/safestack.h
similarity index 58%
rename from openssl-1.1.1a-clang/include/openssl/safestack.h
rename to openssl-1.1.1d-clang/include/openssl/safestack.h
index 7438b19..38b5578 100644
--- a/openssl-1.1.1a-clang/include/openssl/safestack.h
+++ b/openssl-1.1.1d-clang/include/openssl/safestack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2019 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
@@ -24,96 +24,96 @@ extern "C" {
     typedef int (*sk_##t1##_compfunc)(const t3 * const *a, const t3 *const *b); \
     typedef void (*sk_##t1##_freefunc)(t3 *a); \
     typedef t3 * (*sk_##t1##_copyfunc)(const t3 *a); \
-    static ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
     { \
         return OPENSSL_sk_num((const OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
+    static ossl_unused ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
     { \
         return (t2 *)OPENSSL_sk_value((const OPENSSL_STACK *)sk, idx); \
     } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_new(sk_##t1##_compfunc compare) \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new(sk_##t1##_compfunc compare) \
     { \
         return (STACK_OF(t1) *)OPENSSL_sk_new((OPENSSL_sk_compfunc)compare); \
     } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
     { \
         return (STACK_OF(t1) *)OPENSSL_sk_new_null(); \
     } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_new_reserve(sk_##t1##_compfunc compare, int n) \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_reserve(sk_##t1##_compfunc compare, int n) \
     { \
         return (STACK_OF(t1) *)OPENSSL_sk_new_reserve((OPENSSL_sk_compfunc)compare, n); \
     } \
-    static ossl_inline int sk_##t1##_reserve(STACK_OF(t1) *sk, int n) \
+    static ossl_unused ossl_inline int sk_##t1##_reserve(STACK_OF(t1) *sk, int n) \
     { \
         return OPENSSL_sk_reserve((OPENSSL_STACK *)sk, n); \
     } \
-    static ossl_inline void sk_##t1##_free(STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline void sk_##t1##_free(STACK_OF(t1) *sk) \
     { \
         OPENSSL_sk_free((OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline void sk_##t1##_zero(STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline void sk_##t1##_zero(STACK_OF(t1) *sk) \
     { \
         OPENSSL_sk_zero((OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i) \
+    static ossl_unused ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i) \
     { \
         return (t2 *)OPENSSL_sk_delete((OPENSSL_STACK *)sk, i); \
     } \
-    static ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \
+    static ossl_unused ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \
     { \
         return (t2 *)OPENSSL_sk_delete_ptr((OPENSSL_STACK *)sk, \
                                            (const void *)ptr); \
     } \
-    static ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \
+    static ossl_unused ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \
     { \
         return OPENSSL_sk_push((OPENSSL_STACK *)sk, (const void *)ptr); \
     } \
-    static ossl_inline int sk_##t1##_unshift(STACK_OF(t1) *sk, t2 *ptr) \
+    static ossl_unused ossl_inline int sk_##t1##_unshift(STACK_OF(t1) *sk, t2 *ptr) \
     { \
         return OPENSSL_sk_unshift((OPENSSL_STACK *)sk, (const void *)ptr); \
     } \
-    static ossl_inline t2 *sk_##t1##_pop(STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline t2 *sk_##t1##_pop(STACK_OF(t1) *sk) \
     { \
         return (t2 *)OPENSSL_sk_pop((OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline t2 *sk_##t1##_shift(STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline t2 *sk_##t1##_shift(STACK_OF(t1) *sk) \
     { \
         return (t2 *)OPENSSL_sk_shift((OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline void sk_##t1##_pop_free(STACK_OF(t1) *sk, sk_##t1##_freefunc freefunc) \
+    static ossl_unused ossl_inline void sk_##t1##_pop_free(STACK_OF(t1) *sk, sk_##t1##_freefunc freefunc) \
     { \
         OPENSSL_sk_pop_free((OPENSSL_STACK *)sk, (OPENSSL_sk_freefunc)freefunc); \
     } \
-    static ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx) \
+    static ossl_unused ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx) \
     { \
         return OPENSSL_sk_insert((OPENSSL_STACK *)sk, (const void *)ptr, idx); \
     } \
-    static ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \
+    static ossl_unused ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \
     { \
         return (t2 *)OPENSSL_sk_set((OPENSSL_STACK *)sk, idx, (const void *)ptr); \
     } \
-    static ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \
+    static ossl_unused ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \
     { \
         return OPENSSL_sk_find((OPENSSL_STACK *)sk, (const void *)ptr); \
     } \
-    static ossl_inline int sk_##t1##_find_ex(STACK_OF(t1) *sk, t2 *ptr) \
+    static ossl_unused ossl_inline int sk_##t1##_find_ex(STACK_OF(t1) *sk, t2 *ptr) \
     { \
         return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (const void *)ptr); \
     } \
-    static ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk) \
     { \
         OPENSSL_sk_sort((OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline int sk_##t1##_is_sorted(const STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline int sk_##t1##_is_sorted(const STACK_OF(t1) *sk) \
     { \
         return OPENSSL_sk_is_sorted((const OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline STACK_OF(t1) * sk_##t1##_dup(const STACK_OF(t1) *sk) \
+    static ossl_unused ossl_inline STACK_OF(t1) * sk_##t1##_dup(const STACK_OF(t1) *sk) \
     { \
         return (STACK_OF(t1) *)OPENSSL_sk_dup((const OPENSSL_STACK *)sk); \
     } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_deep_copy(const STACK_OF(t1) *sk, \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_deep_copy(const STACK_OF(t1) *sk, \
                                                     sk_##t1##_copyfunc copyfunc, \
                                                     sk_##t1##_freefunc freefunc) \
     { \
@@ -121,7 +121,7 @@ extern "C" {
                                             (OPENSSL_sk_copyfunc)copyfunc, \
                                             (OPENSSL_sk_freefunc)freefunc); \
     } \
-    static ossl_inline sk_##t1##_compfunc sk_##t1##_set_cmp_func(STACK_OF(t1) *sk, sk_##t1##_compfunc compare) \
+    static ossl_unused ossl_inline sk_##t1##_compfunc sk_##t1##_set_cmp_func(STACK_OF(t1) *sk, sk_##t1##_compfunc compare) \
     { \
         return (sk_##t1##_compfunc)OPENSSL_sk_set_cmp_func((OPENSSL_STACK *)sk, (OPENSSL_sk_compfunc)compare); \
     }
@@ -166,6 +166,41 @@ DEFINE_SPECIAL_STACK_OF_CONST(OPENSSL_CSTRING, char)
 typedef void *OPENSSL_BLOCK;
 DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 
+/*
+ * If called without higher optimization (min. -xO3) the Oracle Developer
+ * Studio compiler generates code for the defined (static inline) functions
+ * above.
+ * This would later lead to the linker complaining about missing symbols when
+ * this header file is included but the resulting object is not linked against
+ * the Crypto library (openssl#6912).
+ */
+# ifdef __SUNPRO_C
+#  pragma weak OPENSSL_sk_num
+#  pragma weak OPENSSL_sk_value
+#  pragma weak OPENSSL_sk_new
+#  pragma weak OPENSSL_sk_new_null
+#  pragma weak OPENSSL_sk_new_reserve
+#  pragma weak OPENSSL_sk_reserve
+#  pragma weak OPENSSL_sk_free
+#  pragma weak OPENSSL_sk_zero
+#  pragma weak OPENSSL_sk_delete
+#  pragma weak OPENSSL_sk_delete_ptr
+#  pragma weak OPENSSL_sk_push
+#  pragma weak OPENSSL_sk_unshift
+#  pragma weak OPENSSL_sk_pop
+#  pragma weak OPENSSL_sk_shift
+#  pragma weak OPENSSL_sk_pop_free
+#  pragma weak OPENSSL_sk_insert
+#  pragma weak OPENSSL_sk_set
+#  pragma weak OPENSSL_sk_find
+#  pragma weak OPENSSL_sk_find_ex
+#  pragma weak OPENSSL_sk_sort
+#  pragma weak OPENSSL_sk_is_sorted
+#  pragma weak OPENSSL_sk_dup
+#  pragma weak OPENSSL_sk_deep_copy
+#  pragma weak OPENSSL_sk_set_cmp_func
+# endif /* __SUNPRO_C */
+
 # ifdef  __cplusplus
 }
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/seed.h b/openssl-1.1.1d-clang/include/openssl/seed.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/seed.h
rename to openssl-1.1.1d-clang/include/openssl/seed.h
diff --git a/openssl-1.1.1a-clang/include/openssl/sha.h b/openssl-1.1.1d-clang/include/openssl/sha.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/sha.h
rename to openssl-1.1.1d-clang/include/openssl/sha.h
diff --git a/openssl-1.1.1a-clang/include/openssl/srp.h b/openssl-1.1.1d-clang/include/openssl/srp.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/srp.h
rename to openssl-1.1.1d-clang/include/openssl/srp.h
diff --git a/openssl-1.1.1a-clang/include/openssl/srtp.h b/openssl-1.1.1d-clang/include/openssl/srtp.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/srtp.h
rename to openssl-1.1.1d-clang/include/openssl/srtp.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ssl.h b/openssl-1.1.1d-clang/include/openssl/ssl.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/ssl.h
rename to openssl-1.1.1d-clang/include/openssl/ssl.h
index d6b1b4e..6724ccf 100644
--- a/openssl-1.1.1a-clang/include/openssl/ssl.h
+++ b/openssl-1.1.1d-clang/include/openssl/ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -494,6 +494,19 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
  */
 # define SSL_MODE_ASYNC 0x00000100U
 
+/*
+ * When using DTLS/SCTP, include the terminating zero in the label
+ * used for computing the endpoint-pair shared secret. Required for
+ * interoperability with implementations having this bug like these
+ * older version of OpenSSL:
+ * - OpenSSL 1.0.0 series
+ * - OpenSSL 1.0.1 series
+ * - OpenSSL 1.0.2 series
+ * - OpenSSL 1.1.0 series
+ * - OpenSSL 1.1.1 and 1.1.1a
+ */
+# define SSL_MODE_DTLS_SCTP_LABEL_LENGTH_BUG 0x00000400U
+
 /* Cert related flags */
 /*
  * Many implementations ignore some aspects of the TLS standards such as
@@ -1351,24 +1364,24 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
 # define SSL_CTX_set1_chain_cert_store(ctx,st) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
-# define SSL_set0_chain(ctx,sk) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN,0,(char *)(sk))
-# define SSL_set1_chain(ctx,sk) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN,1,(char *)(sk))
-# define SSL_add0_chain_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN_CERT,0,(char *)(x509))
-# define SSL_add1_chain_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN_CERT,1,(char *)(x509))
-# define SSL_get0_chain_certs(ctx,px509) \
-        SSL_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_clear_chain_certs(ctx) \
-        SSL_set0_chain(ctx,NULL)
+# define SSL_set0_chain(s,sk) \
+        SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
+# define SSL_set1_chain(s,sk) \
+        SSL_ctrl(s,SSL_CTRL_CHAIN,1,(char *)(sk))
+# define SSL_add0_chain_cert(s,x509) \
+        SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,0,(char *)(x509))
+# define SSL_add1_chain_cert(s,x509) \
+        SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,1,(char *)(x509))
+# define SSL_get0_chain_certs(s,px509) \
+        SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
+# define SSL_clear_chain_certs(s) \
+        SSL_set0_chain(s,NULL)
 # define SSL_build_cert_chain(s, flags) \
         SSL_ctrl(s,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_select_current_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509))
-# define SSL_set_current_cert(ctx,op) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
+# define SSL_select_current_cert(s,x509) \
+        SSL_ctrl(s,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509))
+# define SSL_set_current_cert(s,op) \
+        SSL_ctrl(s,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
 # define SSL_set0_verify_cert_store(s,st) \
         SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
 # define SSL_set1_verify_cert_store(s,st) \
@@ -1377,34 +1390,34 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
         SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
 # define SSL_set1_chain_cert_store(s,st) \
         SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
-# define SSL_get1_groups(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_GET_GROUPS,0,(char *)(s))
+# define SSL_get1_groups(s, glist) \
+        SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
 # define SSL_CTX_set1_groups(ctx, glist, glistlen) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist))
 # define SSL_CTX_set1_groups_list(ctx, s) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s))
-# define SSL_set1_groups(ctx, glist, glistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist))
-# define SSL_set1_groups_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s))
+# define SSL_set1_groups(s, glist, glistlen) \
+        SSL_ctrl(s,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist))
+# define SSL_set1_groups_list(s, str) \
+        SSL_ctrl(s,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(str))
 # define SSL_get_shared_group(s, n) \
         SSL_ctrl(s,SSL_CTRL_GET_SHARED_GROUP,n,NULL)
 # define SSL_CTX_set1_sigalgs(ctx, slist, slistlen) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)(slist))
 # define SSL_CTX_set1_sigalgs_list(ctx, s) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)(s))
-# define SSL_set1_sigalgs(ctx, slist, slistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)(slist))
-# define SSL_set1_sigalgs_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)(s))
+# define SSL_set1_sigalgs(s, slist, slistlen) \
+        SSL_ctrl(s,SSL_CTRL_SET_SIGALGS,slistlen,(int *)(slist))
+# define SSL_set1_sigalgs_list(s, str) \
+        SSL_ctrl(s,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)(str))
 # define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,slistlen,(int *)(slist))
 # define SSL_CTX_set1_client_sigalgs_list(ctx, s) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)(s))
-# define SSL_set1_client_sigalgs(ctx, slist, slistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,clistlen,(int *)(slist))
-# define SSL_set1_client_sigalgs_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)(s))
+# define SSL_set1_client_sigalgs(s, slist, slistlen) \
+        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_SIGALGS,slistlen,(int *)(slist))
+# define SSL_set1_client_sigalgs_list(s, str) \
+        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)(str))
 # define SSL_get0_certificate_types(s, clist) \
         SSL_ctrl(s, SSL_CTRL_GET_CLIENT_CERT_TYPES, 0, (char *)(clist))
 # define SSL_CTX_set1_client_certificate_types(ctx, clist, clistlen) \
@@ -1904,17 +1917,17 @@ __owur STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s);
 
 __owur int SSL_do_handshake(SSL *s);
 int SSL_key_update(SSL *s, int updatetype);
-int SSL_get_key_update_type(SSL *s);
+int SSL_get_key_update_type(const SSL *s);
 int SSL_renegotiate(SSL *s);
 int SSL_renegotiate_abbreviated(SSL *s);
-__owur int SSL_renegotiate_pending(SSL *s);
+__owur int SSL_renegotiate_pending(const SSL *s);
 int SSL_shutdown(SSL *s);
 __owur int SSL_verify_client_post_handshake(SSL *s);
 void SSL_CTX_set_post_handshake_auth(SSL_CTX *ctx, int val);
 void SSL_set_post_handshake_auth(SSL *s, int val);
 
-__owur const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx);
-__owur const SSL_METHOD *SSL_get_ssl_method(SSL *s);
+__owur const SSL_METHOD *SSL_CTX_get_ssl_method(const SSL_CTX *ctx);
+__owur const SSL_METHOD *SSL_get_ssl_method(const SSL *s);
 __owur int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
 __owur const char *SSL_alert_type_string_long(int value);
 __owur const char *SSL_alert_type_string(int value);
@@ -2062,8 +2075,8 @@ void SSL_set_tmp_dh_callback(SSL *ssl,
                                         int keylength));
 # endif
 
-__owur const COMP_METHOD *SSL_get_current_compression(SSL *s);
-__owur const COMP_METHOD *SSL_get_current_expansion(SSL *s);
+__owur const COMP_METHOD *SSL_get_current_compression(const SSL *s);
+__owur const COMP_METHOD *SSL_get_current_expansion(const SSL *s);
 __owur const char *SSL_COMP_get_name(const COMP_METHOD *comp);
 __owur const char *SSL_COMP_get0_name(const SSL_COMP *comp);
 __owur int SSL_COMP_get_id(const SSL_COMP *comp);
@@ -2107,26 +2120,26 @@ void SSL_CTX_set_record_padding_callback(SSL_CTX *ctx,
                                          size_t (*cb) (SSL *ssl, int type,
                                                        size_t len, void *arg));
 void SSL_CTX_set_record_padding_callback_arg(SSL_CTX *ctx, void *arg);
-void *SSL_CTX_get_record_padding_callback_arg(SSL_CTX *ctx);
+void *SSL_CTX_get_record_padding_callback_arg(const SSL_CTX *ctx);
 int SSL_CTX_set_block_padding(SSL_CTX *ctx, size_t block_size);
 
 void SSL_set_record_padding_callback(SSL *ssl,
                                     size_t (*cb) (SSL *ssl, int type,
                                                   size_t len, void *arg));
 void SSL_set_record_padding_callback_arg(SSL *ssl, void *arg);
-void *SSL_get_record_padding_callback_arg(SSL *ssl);
+void *SSL_get_record_padding_callback_arg(const SSL *ssl);
 int SSL_set_block_padding(SSL *ssl, size_t block_size);
 
 int SSL_set_num_tickets(SSL *s, size_t num_tickets);
-size_t SSL_get_num_tickets(SSL *s);
+size_t SSL_get_num_tickets(const SSL *s);
 int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets);
-size_t SSL_CTX_get_num_tickets(SSL_CTX *ctx);
+size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx);
 
 # if OPENSSL_API_COMPAT < 0x10100000L
 #  define SSL_cache_hit(s) SSL_session_reused(s)
 # endif
 
-__owur int SSL_session_reused(SSL *s);
+__owur int SSL_session_reused(const SSL *s);
 __owur int SSL_is_server(const SSL *s);
 
 __owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);
diff --git a/openssl-1.1.1a-clang/include/openssl/ssl2.h b/openssl-1.1.1d-clang/include/openssl/ssl2.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ssl2.h
rename to openssl-1.1.1d-clang/include/openssl/ssl2.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ssl3.h b/openssl-1.1.1d-clang/include/openssl/ssl3.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ssl3.h
rename to openssl-1.1.1d-clang/include/openssl/ssl3.h
diff --git a/openssl-1.1.1a-clang/include/openssl/sslerr.h b/openssl-1.1.1d-clang/include/openssl/sslerr.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/sslerr.h
rename to openssl-1.1.1d-clang/include/openssl/sslerr.h
index 87b295c..3d6850d 100644
--- a/openssl-1.1.1a-clang/include/openssl/sslerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/sslerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_SSLERR_H
 # define HEADER_SSLERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
@@ -596,6 +600,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION         209
 # define SSL_R_MISSING_TMP_DH_KEY                         171
 # define SSL_R_MISSING_TMP_ECDH_KEY                       311
+# define SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA     293
 # define SSL_R_NOT_ON_RECORD_BOUNDARY                     182
 # define SSL_R_NOT_REPLACING_CERTIFICATE                  289
 # define SSL_R_NOT_SERVER                                 284
diff --git a/openssl-1.1.1a-clang/include/openssl/stack.h b/openssl-1.1.1d-clang/include/openssl/stack.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/stack.h
rename to openssl-1.1.1d-clang/include/openssl/stack.h
diff --git a/openssl-1.1.1a-clang/include/openssl/store.h b/openssl-1.1.1d-clang/include/openssl/store.h
similarity index 98%
rename from openssl-1.1.1a-clang/include/openssl/store.h
rename to openssl-1.1.1d-clang/include/openssl/store.h
index 7b43e8b..a40a733 100644
--- a/openssl-1.1.1a-clang/include/openssl/store.h
+++ b/openssl-1.1.1d-clang/include/openssl/store.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2019 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
@@ -85,7 +85,7 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx);
 int OSSL_STORE_eof(OSSL_STORE_CTX *ctx);
 
 /*
- * Check if an error occured
+ * Check if an error occurred
  * Returns 1 if it did, 0 otherwise.
  */
 int OSSL_STORE_error(OSSL_STORE_CTX *ctx);
@@ -117,7 +117,7 @@ int OSSL_STORE_close(OSSL_STORE_CTX *ctx);
  * Functions to generate OSSL_STORE_INFOs, one function for each type we
  * support having in them, as well as a generic constructor.
  *
- * In all cases, ownership of the object is transfered to the OSSL_STORE_INFO
+ * In all cases, ownership of the object is transferred to the OSSL_STORE_INFO
  * and will therefore be freed when the OSSL_STORE_INFO is freed.
  */
 OSSL_STORE_INFO *OSSL_STORE_INFO_new_NAME(char *name);
diff --git a/openssl-1.1.1a-clang/include/openssl/storeerr.h b/openssl-1.1.1d-clang/include/openssl/storeerr.h
similarity index 96%
rename from openssl-1.1.1a-clang/include/openssl/storeerr.h
rename to openssl-1.1.1d-clang/include/openssl/storeerr.h
index 33d0ab7..190eab0 100644
--- a/openssl-1.1.1a-clang/include/openssl/storeerr.h
+++ b/openssl-1.1.1d-clang/include/openssl/storeerr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_OSSL_STOREERR_H
 # define HEADER_OSSL_STOREERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/symhacks.h b/openssl-1.1.1d-clang/include/openssl/symhacks.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/symhacks.h
rename to openssl-1.1.1d-clang/include/openssl/symhacks.h
diff --git a/openssl-1.1.1a-clang/include/openssl/tls1.h b/openssl-1.1.1d-clang/include/openssl/tls1.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/tls1.h
rename to openssl-1.1.1d-clang/include/openssl/tls1.h
index e13b5dd..76d9fda 100644
--- a/openssl-1.1.1a-clang/include/openssl/tls1.h
+++ b/openssl-1.1.1d-clang/include/openssl/tls1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -1222,7 +1222,7 @@ __owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain)
 /*
  * extended master secret
  */
-#  define TLS_MD_EXTENDED_MASTER_SECRET_CONST    "\x65\x78\x74\x65\x63\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
+#  define TLS_MD_EXTENDED_MASTER_SECRET_CONST    "\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
 # endif
 
 /* TLS Session Ticket extension struct */
diff --git a/openssl-1.1.1a-clang/include/openssl/ts.h b/openssl-1.1.1d-clang/include/openssl/ts.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ts.h
rename to openssl-1.1.1d-clang/include/openssl/ts.h
diff --git a/openssl-1.1.1a-clang/include/openssl/tserr.h b/openssl-1.1.1d-clang/include/openssl/tserr.h
similarity index 98%
rename from openssl-1.1.1a-clang/include/openssl/tserr.h
rename to openssl-1.1.1d-clang/include/openssl/tserr.h
index 3e04925..07f2333 100644
--- a/openssl-1.1.1a-clang/include/openssl/tserr.h
+++ b/openssl-1.1.1d-clang/include/openssl/tserr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_TSERR_H
 # define HEADER_TSERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_TS
diff --git a/openssl-1.1.1a-clang/include/openssl/txt_db.h b/openssl-1.1.1d-clang/include/openssl/txt_db.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/txt_db.h
rename to openssl-1.1.1d-clang/include/openssl/txt_db.h
diff --git a/openssl-1.1.1a-clang/include/openssl/ui.h b/openssl-1.1.1d-clang/include/openssl/ui.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/ui.h
rename to openssl-1.1.1d-clang/include/openssl/ui.h
diff --git a/openssl-1.1.1a-clang/include/openssl/uierr.h b/openssl-1.1.1d-clang/include/openssl/uierr.h
similarity index 95%
rename from openssl-1.1.1a-clang/include/openssl/uierr.h
rename to openssl-1.1.1d-clang/include/openssl/uierr.h
index 72fd9a9..bd68864 100644
--- a/openssl-1.1.1a-clang/include/openssl/uierr.h
+++ b/openssl-1.1.1d-clang/include/openssl/uierr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_UIERR_H
 # define HEADER_UIERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/include/openssl/whrlpool.h b/openssl-1.1.1d-clang/include/openssl/whrlpool.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/whrlpool.h
rename to openssl-1.1.1d-clang/include/openssl/whrlpool.h
diff --git a/openssl-1.1.1a-clang/include/openssl/x509.h b/openssl-1.1.1d-clang/include/openssl/x509.h
similarity index 100%
rename from openssl-1.1.1a-clang/include/openssl/x509.h
rename to openssl-1.1.1d-clang/include/openssl/x509.h
diff --git a/openssl-1.1.1a-clang/include/openssl/x509_vfy.h b/openssl-1.1.1d-clang/include/openssl/x509_vfy.h
similarity index 98%
rename from openssl-1.1.1a-clang/include/openssl/x509_vfy.h
rename to openssl-1.1.1d-clang/include/openssl/x509_vfy.h
index 2adb155..adb8bce 100644
--- a/openssl-1.1.1a-clang/include/openssl/x509_vfy.h
+++ b/openssl-1.1.1d-clang/include/openssl/x509_vfy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -362,7 +362,11 @@ X509_STORE_CTX_cleanup_fn X509_STORE_CTX_get_cleanup(X509_STORE_CTX *ctx);
 # define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
 # define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
 # define X509_STORE_get_by_subject X509_STORE_CTX_get_by_subject
+# define X509_STORE_get1_certs X509_STORE_CTX_get1_certs
+# define X509_STORE_get1_crls X509_STORE_CTX_get1_crls
+/* the following macro is misspelled; use X509_STORE_get1_certs instead */
 # define X509_STORE_get1_cert X509_STORE_CTX_get1_certs
+/* the following macro is misspelled; use X509_STORE_get1_crls instead */
 # define X509_STORE_get1_crl X509_STORE_CTX_get1_crls
 #endif
 
diff --git a/openssl-1.1.1a-clang/include/openssl/x509err.h b/openssl-1.1.1d-clang/include/openssl/x509err.h
similarity index 97%
rename from openssl-1.1.1a-clang/include/openssl/x509err.h
rename to openssl-1.1.1d-clang/include/openssl/x509err.h
index b1d6a87..0273853 100644
--- a/openssl-1.1.1a-clang/include/openssl/x509err.h
+++ b/openssl-1.1.1d-clang/include/openssl/x509err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_X509ERR_H
 # define HEADER_X509ERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
@@ -93,6 +97,7 @@ int ERR_load_X509_strings(void);
 # define X509_R_CRL_ALREADY_DELTA                         127
 # define X509_R_CRL_VERIFY_FAILURE                        131
 # define X509_R_IDP_MISMATCH                              128
+# define X509_R_INVALID_ATTRIBUTES                        138
 # define X509_R_INVALID_DIRECTORY                         113
 # define X509_R_INVALID_FIELD_NAME                        119
 # define X509_R_INVALID_TRUST                             123
diff --git a/openssl-1.1.1a-clang/include/openssl/x509v3.h b/openssl-1.1.1d-clang/include/openssl/x509v3.h
similarity index 99%
rename from openssl-1.1.1a-clang/include/openssl/x509v3.h
rename to openssl-1.1.1d-clang/include/openssl/x509v3.h
index fe1791c..6c6eca3 100644
--- a/openssl-1.1.1a-clang/include/openssl/x509v3.h
+++ b/openssl-1.1.1d-clang/include/openssl/x509v3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2019 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
@@ -497,10 +497,10 @@ DECLARE_ASN1_FUNCTIONS(OTHERNAME)
 DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
 int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
 void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
-void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype);
+void *GENERAL_NAME_get0_value(const GENERAL_NAME *a, int *ptype);
 int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
                                 ASN1_OBJECT *oid, ASN1_TYPE *value);
-int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen,
+int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen,
                                 ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
 
 char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
@@ -661,6 +661,8 @@ uint32_t X509_get_key_usage(X509 *x);
 uint32_t X509_get_extended_key_usage(X509 *x);
 const ASN1_OCTET_STRING *X509_get0_subject_key_id(X509 *x);
 const ASN1_OCTET_STRING *X509_get0_authority_key_id(X509 *x);
+const GENERAL_NAMES *X509_get0_authority_issuer(X509 *x);
+const ASN1_INTEGER *X509_get0_authority_serial(X509 *x);
 
 int X509_PURPOSE_get_count(void);
 X509_PURPOSE *X509_PURPOSE_get0(int idx);
diff --git a/openssl-1.1.1a-clang/include/openssl/x509v3err.h b/openssl-1.1.1d-clang/include/openssl/x509v3err.h
similarity index 98%
rename from openssl-1.1.1a-clang/include/openssl/x509v3err.h
rename to openssl-1.1.1d-clang/include/openssl/x509v3err.h
index 6b3df12..5f25442 100644
--- a/openssl-1.1.1a-clang/include/openssl/x509v3err.h
+++ b/openssl-1.1.1d-clang/include/openssl/x509v3err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 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
@@ -11,6 +11,10 @@
 #ifndef HEADER_X509V3ERR_H
 # define HEADER_X509V3ERR_H
 
+# ifndef HEADER_SYMHACKS_H
+#  include <openssl/symhacks.h>
+# endif
+
 # ifdef  __cplusplus
 extern "C"
 # endif
diff --git a/openssl-1.1.1a-clang/x86/lib/libcrypto.a b/openssl-1.1.1d-clang/x86/lib/libcrypto.a
similarity index 79%
rename from openssl-1.1.1a-clang/x86/lib/libcrypto.a
rename to openssl-1.1.1d-clang/x86/lib/libcrypto.a
index ff6e286..fca47e0 100644
Binary files a/openssl-1.1.1a-clang/x86/lib/libcrypto.a and b/openssl-1.1.1d-clang/x86/lib/libcrypto.a differ
diff --git a/openssl-1.1.1a-clang/x86/lib/libcrypto.so b/openssl-1.1.1d-clang/x86/lib/libcrypto.so
similarity index 100%
rename from openssl-1.1.1a-clang/x86/lib/libcrypto.so
rename to openssl-1.1.1d-clang/x86/lib/libcrypto.so
diff --git a/openssl-1.1.1d-clang/x86/lib/libcrypto.so.1.1 b/openssl-1.1.1d-clang/x86/lib/libcrypto.so.1.1
new file mode 100755
index 0000000..48bae32
Binary files /dev/null and b/openssl-1.1.1d-clang/x86/lib/libcrypto.so.1.1 differ
diff --git a/openssl-1.1.1d-clang/x86/lib/libssl.a b/openssl-1.1.1d-clang/x86/lib/libssl.a
new file mode 100644
index 0000000..00ec59e
Binary files /dev/null and b/openssl-1.1.1d-clang/x86/lib/libssl.a differ
diff --git a/openssl-1.1.1a-clang/x86/lib/libssl.so b/openssl-1.1.1d-clang/x86/lib/libssl.so
similarity index 100%
rename from openssl-1.1.1a-clang/x86/lib/libssl.so
rename to openssl-1.1.1d-clang/x86/lib/libssl.so
diff --git a/openssl-1.1.1d-clang/x86/lib/libssl.so.1.1 b/openssl-1.1.1d-clang/x86/lib/libssl.so.1.1
new file mode 100755
index 0000000..97c7c52
Binary files /dev/null and b/openssl-1.1.1d-clang/x86/lib/libssl.so.1.1 differ
diff --git a/openssl-1.1.1a-clang/x86_64/lib/libcrypto.a b/openssl-1.1.1d-clang/x86_64/lib/libcrypto.a
similarity index 78%
rename from openssl-1.1.1a-clang/x86_64/lib/libcrypto.a
rename to openssl-1.1.1d-clang/x86_64/lib/libcrypto.a
index 4b03b63..3839af0 100644
Binary files a/openssl-1.1.1a-clang/x86_64/lib/libcrypto.a and b/openssl-1.1.1d-clang/x86_64/lib/libcrypto.a differ
diff --git a/openssl-1.1.1a-clang/x86_64/lib/libcrypto.so b/openssl-1.1.1d-clang/x86_64/lib/libcrypto.so
similarity index 100%
rename from openssl-1.1.1a-clang/x86_64/lib/libcrypto.so
rename to openssl-1.1.1d-clang/x86_64/lib/libcrypto.so
diff --git a/openssl-1.1.1d-clang/x86_64/lib/libcrypto.so.1.1 b/openssl-1.1.1d-clang/x86_64/lib/libcrypto.so.1.1
new file mode 100755
index 0000000..df6c497
Binary files /dev/null and b/openssl-1.1.1d-clang/x86_64/lib/libcrypto.so.1.1 differ
diff --git a/openssl-1.1.1d-clang/x86_64/lib/libssl.a b/openssl-1.1.1d-clang/x86_64/lib/libssl.a
new file mode 100644
index 0000000..93906c6
Binary files /dev/null and b/openssl-1.1.1d-clang/x86_64/lib/libssl.a differ
diff --git a/openssl-1.1.1a-clang/x86_64/lib/libssl.so b/openssl-1.1.1d-clang/x86_64/lib/libssl.so
similarity index 100%
rename from openssl-1.1.1a-clang/x86_64/lib/libssl.so
rename to openssl-1.1.1d-clang/x86_64/lib/libssl.so
diff --git a/openssl-1.1.1d-clang/x86_64/lib/libssl.so.1.1 b/openssl-1.1.1d-clang/x86_64/lib/libssl.so.1.1
new file mode 100755
index 0000000..d26146b
Binary files /dev/null and b/openssl-1.1.1d-clang/x86_64/lib/libssl.so.1.1 differ