commit c70581c272dd8b01d5caacab5e42dadcd1e9367f
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 23 13:58:27 2015 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 23 14:11:11 2015 +0100
tree 2d2c8706ab1e7e768815ad01fa554a48aa2ca541
parent 85b6600ab262e5fcd1682ffadd974ffcda95d7d3

Add POLARSSL_DEPRECATED_{WARNING,REMOVED}

library/pbkdf2.c

diff --git a/library/pbkdf2.c b/library/pbkdf2.c
index b4ef195..783e4a8 100644
--- a/library/pbkdf2.c
+++ b/library/pbkdf2.c
@@ -41,6 +41,7 @@
 #include "polarssl/pbkdf2.h"
 #include "polarssl/pkcs5.h"
 
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 int pbkdf2_hmac( md_context_t *ctx, const unsigned char *password, size_t plen,
                  const unsigned char *salt, size_t slen,
                  unsigned int iteration_count,
@@ -49,12 +50,15 @@
     return pkcs5_pbkdf2_hmac( ctx, password, plen, salt, slen, iteration_count,
                               key_length, output );
 }
+#endif
 
 #if defined(POLARSSL_SELF_TEST)
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 int pbkdf2_self_test( int verbose )
 {
     return pkcs5_self_test( verbose );
 }
+#endif
 #endif /* POLARSSL_SELF_TEST */
 
 #endif /* POLARSSL_PBKDF2_C */