[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6f5c03032080aa35e2ad5765b7243b8c75305611 (commit)
      from  0e56b4b42439d0842956a6730dec904ed70bbef7 (commit)


- Log -----------------------------------------------------------------
commit 6f5c03032080aa35e2ad5765b7243b8c75305611
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Oct 27 15:44:15 2015 -0400

    Remove HAMC_cleanup
    
    Old API for use with OpenSSL-0.9.6.  Remove it.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/crypto/hmac.pod    | 7 +------
 include/openssl/hmac.h | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/doc/crypto/hmac.pod b/doc/crypto/hmac.pod
index 372a0f4..88f5abc 100644
--- a/doc/crypto/hmac.pod
+++ b/doc/crypto/hmac.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-HMAC, HMAC_CTX_init, HMAC_Init, HMAC_Init_ex, HMAC_Update, HMAC_Final, HMAC_CTX_cleanup,
-HMAC_cleanup - HMAC message authentication code
+HMAC, HMAC_CTX_init, HMAC_Init, HMAC_Init_ex, HMAC_Update, HMAC_Final, HMAC_CTX_cleanup - HMAC message authentication code
 
 =head1 SYNOPSIS
 
@@ -23,7 +22,6 @@ HMAC_cleanup - HMAC message authentication code
  int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
 
  void HMAC_CTX_cleanup(HMAC_CTX *ctx);
- void HMAC_cleanup(HMAC_CTX *ctx);
 
 =head1 DESCRIPTION
 
@@ -49,9 +47,6 @@ HMAC_CTX_cleanup() erases the key and other data from the B<HMAC_CTX>
 and releases any associated resources. It must be called when an
 B<HMAC_CTX> is no longer required.
 
-HMAC_cleanup() is an alias for HMAC_CTX_cleanup() included for back
-compatibility with 0.9.6b, it is deprecated.
-
 The following functions may be used if the message is not completely
 stored in memory:
 
diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index 81aa49d..011e2ae 100644
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -83,8 +83,6 @@ void HMAC_CTX_init(HMAC_CTX *ctx);
 void HMAC_CTX_cleanup(HMAC_CTX *ctx);
 
 #ifdef OPENSSL_USE_DEPRECATED
-/* deprecated */
-# define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx)
 
 /* deprecated */
 DECLARE_DEPRECATED(__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,