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/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 516fa00..b69d331 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -165,13 +165,14 @@
     return( 0 );
 }
 
-/* compatibility wrapper */
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 int cipher_free_ctx( cipher_context_t *ctx )
 {
     cipher_free( ctx );
 
     return( 0 );
 }
+#endif
 
 int cipher_setkey( cipher_context_t *ctx, const unsigned char *key,
         int key_length, const operation_t operation )

library/md.c

diff --git a/library/md.c b/library/md.c
index fbdab91..cf4d7e3 100644
--- a/library/md.c
+++ b/library/md.c
@@ -203,12 +203,14 @@
     return( 0 );
 }
 
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 int md_free_ctx( md_context_t *ctx )
 {
     md_free( ctx );
 
     return( 0 );
 }
+#endif
 
 int md_starts( md_context_t *ctx )
 {

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 */

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 77bb9ad..515b903 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3976,6 +3976,7 @@
     return( 0 );
 }
 
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 #if defined(POLARSSL_RSA_C)
 int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
                            rsa_context *rsa_key )
@@ -4033,6 +4034,7 @@
 
     return( 0 );
 }
+#endif /* POLARSSL_DEPRECATED_REMOVED */
 #endif /* POLARSSL_X509_CRT_PARSE_C */
 
 #if defined(POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED)

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index b35663d..922f023 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -880,6 +880,7 @@
 /*
  * Return an informational string describing the given OID
  */
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 const char *x509_oid_get_description( x509_buf *oid )
 {
     const char *desc = NULL;
@@ -892,12 +893,15 @@
 
     return( desc );
 }
+#endif
 
 /* Return the x.y.z.... style numeric string for the given OID */
+#if ! defined(POLARSSL_DEPRECATED_REMOVED)
 int x509_oid_get_numeric_string( char *buf, size_t size, x509_buf *oid )
 {
     return oid_get_numeric_string( buf, size, oid );
 }
+#endif
 
 /*
  * Return 0 if the x509_time is still valid, or 1 otherwise.