[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0081ce9b0201417cf2b35792a2a199e36acadcf2 (commit)
      from  1cf20ca31bed31c0bd16c6ed1eeaa1b9580939b7 (commit)


- Log -----------------------------------------------------------------
commit 0081ce9b0201417cf2b35792a2a199e36acadcf2
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 6 20:25:08 2020 +0100

    Add missing inclusion of "internal/deprecated.h"
    
    A few provider implementations need this to build correctly with a
    'no-deprecated' configuration.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10766)

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

Summary of changes:
 providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c       | 8 +++++++-
 providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c   | 7 +++++++
 providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c | 7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
index 00b46c3f78..6af46ce2aa 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
@@ -7,8 +7,14 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* Dispatch functions for AES_CBC_HMAC_SHA ciphers */
+/*
+ * AES low level APIs are deprecated for public use, but still ok for internal
+ * use where we're using them to implement the higher level EVP interface, as is
+ * the case here.
+ */
+#include "internal/deprecated.h"
 
+/* Dispatch functions for AES_CBC_HMAC_SHA ciphers */
 
 #include "cipher_aes_cbc_hmac_sha.h"
 #include "prov/implementations.h"
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
index 125369d7ff..056dd7866c 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
@@ -7,6 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+/*
+ * AES low level APIs are deprecated for public use, but still ok for internal
+ * use where we're using them to implement the higher level EVP interface, as is
+ * the case here.
+ */
+#include "internal/deprecated.h"
+
 #include "cipher_aes_cbc_hmac_sha.h"
 
 #ifndef AES_CBC_HMAC_SHA_CAPABLE
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
index 4352476264..a7b3c199b3 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
@@ -7,6 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+/*
+ * AES low level APIs are deprecated for public use, but still ok for internal
+ * use where we're using them to implement the higher level EVP interface, as is
+ * the case here.
+ */
+#include "internal/deprecated.h"
+
 #include "cipher_aes_cbc_hmac_sha.h"
 
 #ifndef AES_CBC_HMAC_SHA_CAPABLE