[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6a7de8e0942df50899fe74649731417a76860152 (commit)
       via  1e45206fb9f24293f3673d54f4879eb631dea117 (commit)
       via  0f1d814c2313e2b844d611625e9676d00aa404fb (commit)
      from  d46057277f3b805e5f198e31fc81a892bf5c9141 (commit)


- Log -----------------------------------------------------------------
commit 6a7de8e0942df50899fe74649731417a76860152
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 10 09:21:23 2016 +0000

    Remove a missed item from the old thread API
    
    A line from cryptlib.h was missed during the old Thread API removal. This
    breaks no-deprecated builds.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 1e45206fb9f24293f3673d54f4879eb631dea117
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 10 09:20:06 2016 +0000

    Mark SRP_VBASE_get_by_user() as deprecated
    
    The function SRP_VBASE_get_by_user() is declared as deprecated but the
    implementation was not.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 0f1d814c2313e2b844d611625e9676d00aa404fb
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 10 09:18:50 2016 +0000

    No need to call EVP_CIPHER_CTX_init after EVP_CIPHER_CTX_new
    
    The afalgtest was unnecessarily initing an EVP_CIPHER_CTX. It is not
    needed and is deprecated.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/include/internal/cryptlib.h | 2 --
 crypto/srp/srp_vfy.c               | 2 ++
 test/afalgtest.c                   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h
index a97e20b..8fe9057 100644
--- a/crypto/include/internal/cryptlib.h
+++ b/crypto/include/internal/cryptlib.h
@@ -82,8 +82,6 @@ typedef struct ex_callback_st EX_CALLBACK;
 
 DEFINE_STACK_OF(EX_CALLBACK)
 
-DEFINE_STACK_OF(CRYPTO_dynlock)
-
 typedef struct app_mem_info_st APP_INFO;
 DEFINE_LHASH_OF(APP_INFO);
 typedef struct mem_st MEM;
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 0d3da7e..78db608 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -502,6 +502,7 @@ static SRP_user_pwd *find_user(SRP_VBASE *vb, char *username)
     return NULL;
 }
 
+ #if OPENSSL_API_COMPAT < 0x10100000L
 /*
  * DEPRECATED: use SRP_VBASE_get1_by_user instead.
  * This method ignores the configured seed and fails for an unknown user.
@@ -512,6 +513,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
 {
     return find_user(vb, username);
 }
+#endif
 
 /*
  * Ownership of the returned pointer is released to the caller.
diff --git a/test/afalgtest.c b/test/afalgtest.c
index c15e111..e132744 100644
--- a/test/afalgtest.c
+++ b/test/afalgtest.c
@@ -82,7 +82,6 @@ static int test_afalg_aes_128_cbc(ENGINE *e)
         fprintf(stderr, "%s() failed to allocate ctx\n", __func__);
         return 0;
     }
-    EVP_CIPHER_CTX_init(ctx);
     RAND_bytes(in, BUFFER_SIZE);
 
     if (       !EVP_CipherInit_ex(ctx, cipher, e, key, iv, 1)