commit 32ae73b289bdb6c751b795f582451b497695bdb5
author Jaeden Amero <jaeden.amero@arm.com> Wed Mar 14 17:59:59 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Thu Mar 15 14:33:29 2018 +0000
tree ddd1fff0e1d44abce040e77938280d79da8946c6
parent 100273ddfb9199b23cc973d2f34f352c28b8c9c1
parent 8db3efbc76243971adcae0d5abe439bc3af931f9

Merge remote-tracking branch 'upstream-public/pr/1448' into mbedtls-2.7-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b7428b1..5c8af69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
      that could cause a key exchange to fail on valid data.
    * Fix a possible arithmetic overflow in ssl_parse_server_psk_hint() that
      could cause a key exchange to fail on valid data.
+   * Don't define mbedtls_aes_decrypt and mbedtls_aes_encrypt under
+     MBEDTLS_DEPRECATED_REMOVED. #1388
 
 Changes
    * Clarify the documentation of mbedtls_ssl_setup.

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index dba4a5f..3d2eac8 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -765,12 +765,14 @@
 }
 #endif /* !MBEDTLS_AES_ENCRYPT_ALT */
 
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_aes_encrypt( mbedtls_aes_context *ctx,
                           const unsigned char input[16],
                           unsigned char output[16] )
 {
     mbedtls_internal_aes_encrypt( ctx, input, output );
 }
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
 
 /*
  * AES-ECB block decryption
@@ -831,12 +833,14 @@
 }
 #endif /* !MBEDTLS_AES_DECRYPT_ALT */
 
+#if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
                           const unsigned char input[16],
                           unsigned char output[16] )
 {
     mbedtls_internal_aes_decrypt( ctx, input, output );
 }
+#endif /* !MBEDTLS_DEPRECATED_REMOVED */
 
 /*
  * AES-ECB block encryption/decryption