commit deda80e80da3984af81ced6e0227c2f23c34d832
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon May 07 09:58:35 2018 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu May 10 13:22:14 2018 +0200
tree 520b618f1b9ab202b27bafcdfe04bf8eeb2b0fdd
parent 690d9e6fad23ec9cac0260fc7ddca41180ec09ea

Adapt the _ALT style to our new standard

- in .h files: only put the context declaration inside the #ifdef _ALT
  (this was changed in 2.9.0, ie after the original PR)
- in .c file: only leave selftest out of _ALT: even though some function are
  trivial to build from other parts, alt implementors might want to go another
way about them (for efficiency or other reasons)

library/aead_chacha20_poly1305.c

diff --git a/library/aead_chacha20_poly1305.c b/library/aead_chacha20_poly1305.c
index 8d7b63a..2e07f1e 100644
--- a/library/aead_chacha20_poly1305.c
+++ b/library/aead_chacha20_poly1305.c
@@ -291,8 +291,6 @@
     return( 0 );
 }
 
-#endif /* MBEDTLS_AEAD_CHACHA20_POLY1305_ALT */
-
 int mbedtls_aead_chacha20_poly1305_crypt_and_mac ( const unsigned char key[32],
                                                     const unsigned char nonce[12],
                                                     mbedtls_aead_chacha20_poly1305_mode_t mode,
@@ -331,6 +329,8 @@
     return( result );
 }
 
+#endif /* MBEDTLS_AEAD_CHACHA20_POLY1305_ALT */
+
 #if defined(MBEDTLS_SELF_TEST)
 
 static const unsigned char test_key[1][32] =

library/chacha20.c

diff --git a/library/chacha20.c b/library/chacha20.c
index 4c2d8ef..5d2c3e5 100644
--- a/library/chacha20.c
+++ b/library/chacha20.c
@@ -354,8 +354,6 @@
     return( 0 );
 }
 
-#endif /* !MBEDTLS_CHACHA20_ALT */
-
 int mbedtls_chacha20_crypt( const unsigned char key[32],
                             const unsigned char nonce[12],
                             uint32_t counter,
@@ -383,6 +381,8 @@
     return( result );
 }
 
+#endif /* !MBEDTLS_CHACHA20_ALT */
+
 #if defined(MBEDTLS_SELF_TEST)
 
 static const unsigned char test_keys[2][32] =

library/poly1305.c

diff --git a/library/poly1305.c b/library/poly1305.c
index 842a4d4..6acbc7f 100644
--- a/library/poly1305.c
+++ b/library/poly1305.c
@@ -390,8 +390,6 @@
     return( 0 );
 }
 
-#endif /* MBEDTLS_POLY1305_ALT */
-
 int mbedtls_poly1305_mac( const unsigned char key[32],
                            size_t ilen,
                            const unsigned char *input,
@@ -417,6 +415,8 @@
     return( 0 );
 }
 
+#endif /* MBEDTLS_POLY1305_ALT */
+
 #if defined(MBEDTLS_SELF_TEST)
 
 static const unsigned char test_keys[2][32] =