Permalink
Browse files

unifdef EVP_CHECK_DES_KEY: Ben Kaduk noticed it has a syntax error; that

error was present in the original 2004 commit, so it hasn't been used in
over 11 years, thus exceeding our deprecation requirements by over a decade.
OpenSSL has chosen to *fix it*; we'll gladly watch it burn

ok jsing@
  • Loading branch information...
guenther
guenther committed Oct 12, 2015
1 parent 2dea156 commit cb62fd8b9b1d3f0cdfb5445d0c53b560707a3376
Showing with 2 additions and 20 deletions.
  1. +1 −6 src/lib/libssl/src/crypto/evp/e_des.c
  2. +1 −14 src/lib/libssl/src/crypto/evp/e_des3.c
@@ -1,4 +1,4 @@
/* $OpenBSD: e_des.c,v 1.12 2014/07/22 18:10:48 miod Exp $ */
/* $OpenBSD: e_des.c,v 1.13 2014/10/18 17:20:40 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -205,12 +205,7 @@ des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
{
DES_cblock *deskey = (DES_cblock *)key;
#ifdef EVP_CHECK_DES_KEY
if (DES_set_key_checked(deskey, ctx->cipher_data) != 0)
return 0;
#else
DES_set_key_unchecked(deskey, ctx->cipher_data);
#endif
return 1;
}
@@ -1,4 +1,4 @@
/* $OpenBSD: e_des3.c,v 1.17 2014/07/22 18:10:48 miod Exp $ */
/* $OpenBSD: e_des3.c,v 1.18 2014/10/18 17:20:40 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -230,14 +230,8 @@ des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
{
DES_cblock *deskey = (DES_cblock *)key;
#ifdef EVP_CHECK_DES_KEY
if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
!! DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
return 0;
#else
DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
#endif
memcpy(&data(ctx)->ks3, &data(ctx)->ks1,
sizeof(data(ctx)->ks1));
return 1;
@@ -250,16 +244,9 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
DES_cblock *deskey = (DES_cblock *)key;
#ifdef EVP_CHECK_DES_KEY
if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) ||
DES_set_key_checked(&deskey[1], &data(ctx)->ks2) ||
DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
return 0;
#else
DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3);
#endif
return 1;
}

0 comments on commit cb62fd8

Please sign in to comment.