[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  8707e3be0c92f05ac3566cc79191b661195fe9f2 (commit)
       via  64c711cd0e8c0d79f41563e84ee8c0710b4e78d8 (commit)
      from  7ff970ef55a1552e5a1acc6d337250c755b7fd0d (commit)


- Log -----------------------------------------------------------------
commit 8707e3be0c92f05ac3566cc79191b661195fe9f2
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Thu Jan 7 23:56:43 2016 -0500

    Update comment as bn_dup_expand is gone
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 64c711cd0e8c0d79f41563e84ee8c0710b4e78d8
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Thu Jan 7 23:47:30 2016 -0500

    Simplify deprecated declaration exception
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/bn/bn_lib.c       | 2 +-
 include/openssl/crypto.h | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 6393a34..150f4b8 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -295,7 +295,7 @@ BIGNUM *BN_new(void)
      return (ret);
  }
 
-/* This is used both by bn_expand2() and bn_dup_expand() */
+/* This is used by bn_expand2() */
 /* The caller MUST check that words > b->dmax before calling this */
 static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
 {
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index a85b021..65f150e 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -431,13 +431,7 @@ int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b);
 void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src);
 unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
 DEPRECATEDIN_1_0_0(void CRYPTO_set_id_callback(unsigned long (*func) (void)))
-/*
- * mkdef.pl cannot handle this next one so not inside DEPRECATEDIN_1_0_0,
- * but still conditional on a lower or unknown source API version.
- */
-# if OPENSSL_API_COMPAT < 0x10000000L
-unsigned long (*CRYPTO_get_id_callback(void)) (void);
-# endif
+DEPRECATEDIN_1_0_0(unsigned long (*CRYPTO_get_id_callback(void)) (void))
 DEPRECATEDIN_1_0_0(unsigned long CRYPTO_thread_id(void))
 
 const char *CRYPTO_get_lock_name(int type);