[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Benjamin Kaduk]

I would guess that no one has ever set EVP_CHECK_DES_KEY during the 11
years the code has been around (since commit
216659eb87485402a8e861a6de77233d1f5d7425), so maybe that code should
just be removed.  Sorry I didn't mention that in the ticket; I was in
the middle of something else at the time but wanted to note the issue
while it was in front of me.

-Ben

On 10/11/2015 04:36 PM, Ben Laurie wrote:
> How did that ever compile? Is EVP_CHECK_DES_KEY ever set?
>
> On Sat, 10 Oct 2015 at 16:50 Dr. Stephen Henson <steve at openssl.org
> <mailto:steve at openssl.org>> wrote:
>
>     The branch OpenSSL_1_0_2-stable has been updated
>            via  6868346585f38066de4610b516346a18a98a8427 (commit)
>           from  985abd1fd8aa24ef1bbf6adcf1923d07b35fa246 (commit)
>
>
>     - Log
>     -----------------------------------------------------------------
>     commit 6868346585f38066de4610b516346a18a98a8427
>     Author: Dr. Stephen Henson <steve at openssl.org
>     <mailto:steve at openssl.org>>
>     Date:   Sun Oct 11 00:06:56 2015 +0100
>
>         Typo.
>
>         PR#4079
>
>         Reviewed-by: Tim Hudson <tjh at openssl.org <mailto:tjh at openssl.org>>
>         (cherry picked from commit
>     c69ce9351336f5b4a8b33890756b3fd185528210)
>
>     -----------------------------------------------------------------------
>
>     Summary of changes:
>      crypto/evp/e_des3.c | 2 +-
>      1 file changed, 1 insertion(+), 1 deletion(-)
>
>     diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
>     index 96f272e..bf6c1d2 100644
>     --- a/crypto/evp/e_des3.c
>     +++ b/crypto/evp/e_des3.c
>     @@ -289,7 +289,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX
>     *ctx, const unsigned char *key,
>      # endif
>      # ifdef EVP_CHECK_DES_KEY
>          if (DES_set_key_checked(&deskey[0], &dat->ks1)
>     -        ! !DES_set_key_checked(&deskey[1], &dat->ks2))
>     +        || DES_set_key_checked(&deskey[1], &dat->ks2))
>              return 0;
>      # else
>          DES_set_key_unchecked(&deskey[0], &dat->ks1);
>     _____
>     openssl-commits mailing list
>     To unsubscribe:
>     https://mta.openssl.org/mailman/listinfo/openssl-commits
>     <https://urldefense.proofpoint.com/v2/url?u=https-3A__mta.openssl.org_mailman_listinfo_openssl-2Dcommits&d=BQMFaQ&c=96ZbZZcaMF4w0F4jpN6LZg&r=sssDLkeEEBWNIXmTsdpw8TZ3tAJx-Job4p1unc7rOhM&m=2bMQx1g4zFgKwqTuiHku5h_nSCjV33uYrlBYVEfat3k&s=Kd8SsSaL4KsJEDB4ecZGzDIfxVxNbuxJYFJM8q6nBHY&e=>
>
>
>
> _____
> openssl-commits mailing list
> To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mta.openssl.org/pipermail/openssl-commits/attachments/20151012/59ac1d4e/attachment.html>