From a13e6e8ffbac02df8fbc12cad96b87cf64ebd239 Mon Sep 17 00:00:00 2001
From: Mohammad Azim Khan <Azim.Khan@arm.com>
Date: Fri, 23 Feb 2018 17:25:54 +0000
Subject: [PATCH] Revert "Merge pull request #1399 from
 mazimkhan/feature-opaque-keys"

This reverts commit 31a24b8d0c084fc7632c4c3cc47a1fc92dcfa75f, reversing
changes made to b3411e57654613f4ca79cc8699d1c270bebdad46.
---
 library/md2.c    | 2 +-
 library/md4.c    | 2 +-
 library/md5.c    | 2 +-
 library/sha1.c   | 2 +-
 library/sha256.c | 2 +-
 library/sha512.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/md2.c b/library/md2.c
index d970d82f8..b88aa406a 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -158,7 +158,6 @@ int mbedtls_internal_md2_process( mbedtls_md2_context *ctx )
 
     return( 0 );
 }
-#endif /* !MBEDTLS_MD2_PROCESS_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md2_process( mbedtls_md2_context *ctx )
@@ -166,6 +165,7 @@ void mbedtls_md2_process( mbedtls_md2_context *ctx )
     mbedtls_internal_md2_process( ctx );
 }
 #endif
+#endif /* !MBEDTLS_MD2_PROCESS_ALT */
 
 /*
  * MD2 process buffer
diff --git a/library/md4.c b/library/md4.c
index 8adf523c0..ba704f58e 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -224,7 +224,6 @@ int mbedtls_internal_md4_process( mbedtls_md4_context *ctx,
 
     return( 0 );
 }
-#endif /* !MBEDTLS_MD4_PROCESS_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md4_process( mbedtls_md4_context *ctx,
@@ -233,6 +232,7 @@ void mbedtls_md4_process( mbedtls_md4_context *ctx,
     mbedtls_internal_md4_process( ctx, data );
 }
 #endif
+#endif /* !MBEDTLS_MD4_PROCESS_ALT */
 
 /*
  * MD4 process buffer
diff --git a/library/md5.c b/library/md5.c
index f58ffc83c..8440ebffc 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -243,7 +243,6 @@ int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
 
     return( 0 );
 }
-#endif /* !MBEDTLS_MD5_PROCESS_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_md5_process( mbedtls_md5_context *ctx,
@@ -252,6 +251,7 @@ void mbedtls_md5_process( mbedtls_md5_context *ctx,
     mbedtls_internal_md5_process( ctx, data );
 }
 #endif
+#endif /* !MBEDTLS_MD5_PROCESS_ALT */
 
 /*
  * MD5 process buffer
diff --git a/library/sha1.c b/library/sha1.c
index a62660dcc..1f29a0fbf 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -277,7 +277,6 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
 
     return( 0 );
 }
-#endif /* !MBEDTLS_SHA1_PROCESS_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
@@ -286,6 +285,7 @@ void mbedtls_sha1_process( mbedtls_sha1_context *ctx,
     mbedtls_internal_sha1_process( ctx, data );
 }
 #endif
+#endif /* !MBEDTLS_SHA1_PROCESS_ALT */
 
 /*
  * SHA-1 process buffer
diff --git a/library/sha256.c b/library/sha256.c
index b438b9c39..f39bcbab6 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -246,7 +246,6 @@ int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
 
     return( 0 );
 }
-#endif /* !MBEDTLS_SHA256_PROCESS_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
@@ -255,6 +254,7 @@ void mbedtls_sha256_process( mbedtls_sha256_context *ctx,
     mbedtls_internal_sha256_process( ctx, data );
 }
 #endif
+#endif /* !MBEDTLS_SHA256_PROCESS_ALT */
 
 /*
  * SHA-256 process buffer
diff --git a/library/sha512.c b/library/sha512.c
index 4d43487a9..97cee07c5 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -277,7 +277,6 @@ int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
 
     return( 0 );
 }
-#endif /* !MBEDTLS_SHA512_PROCESS_ALT */
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 void mbedtls_sha512_process( mbedtls_sha512_context *ctx,
@@ -286,6 +285,7 @@ void mbedtls_sha512_process( mbedtls_sha512_context *ctx,
     mbedtls_internal_sha512_process( ctx, data );
 }
 #endif
+#endif /* !MBEDTLS_SHA512_PROCESS_ALT */
 
 /*
  * SHA-512 process buffer