diff options
Diffstat (limited to 'src/lib/libcrypto/evp/e_des.c')
-rw-r--r-- | src/lib/libcrypto/evp/e_des.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/e_des.c b/src/lib/libcrypto/evp/e_des.c index aac6ddf318..ad91720ff1 100644 --- a/src/lib/libcrypto/evp/e_des.c +++ b/src/lib/libcrypto/evp/e_des.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: e_des.c,v 1.13 2014/10/18 17:20:40 jsing Exp $ */ | 1 | /* $OpenBSD: e_des.c,v 1.14 2015/10/12 06:05:52 guenther Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -205,12 +205,7 @@ des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
205 | { | 205 | { |
206 | DES_cblock *deskey = (DES_cblock *)key; | 206 | DES_cblock *deskey = (DES_cblock *)key; |
207 | 207 | ||
208 | #ifdef EVP_CHECK_DES_KEY | ||
209 | if (DES_set_key_checked(deskey, ctx->cipher_data) != 0) | ||
210 | return 0; | ||
211 | #else | ||
212 | DES_set_key_unchecked(deskey, ctx->cipher_data); | 208 | DES_set_key_unchecked(deskey, ctx->cipher_data); |
213 | #endif | ||
214 | return 1; | 209 | return 1; |
215 | } | 210 | } |
216 | 211 | ||