summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/evp/e_des.c7
-rw-r--r--src/lib/libcrypto/evp/e_des3.c15
-rw-r--r--src/lib/libssl/src/crypto/evp/e_des.c7
-rw-r--r--src/lib/libssl/src/crypto/evp/e_des3.c15
4 files changed, 4 insertions, 40 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
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c
index d0793b6436..3cb95a8e22 100644
--- a/src/lib/libcrypto/evp/e_des3.c
+++ b/src/lib/libcrypto/evp/e_des3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_des3.c,v 1.18 2014/10/18 17:20:40 jsing Exp $ */ 1/* $OpenBSD: e_des3.c,v 1.19 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 *
@@ -230,14 +230,8 @@ des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
230{ 230{
231 DES_cblock *deskey = (DES_cblock *)key; 231 DES_cblock *deskey = (DES_cblock *)key;
232 232
233#ifdef EVP_CHECK_DES_KEY
234 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
235 !! DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
236 return 0;
237#else
238 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); 233 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
239 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); 234 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
240#endif
241 memcpy(&data(ctx)->ks3, &data(ctx)->ks1, 235 memcpy(&data(ctx)->ks3, &data(ctx)->ks1,
242 sizeof(data(ctx)->ks1)); 236 sizeof(data(ctx)->ks1));
243 return 1; 237 return 1;
@@ -250,16 +244,9 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
250 DES_cblock *deskey = (DES_cblock *)key; 244 DES_cblock *deskey = (DES_cblock *)key;
251 245
252 246
253#ifdef EVP_CHECK_DES_KEY
254 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) ||
255 DES_set_key_checked(&deskey[1], &data(ctx)->ks2) ||
256 DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
257 return 0;
258#else
259 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); 247 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
260 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); 248 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
261 DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3); 249 DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3);
262#endif
263 return 1; 250 return 1;
264} 251}
265 252
diff --git a/src/lib/libssl/src/crypto/evp/e_des.c b/src/lib/libssl/src/crypto/evp/e_des.c
index aac6ddf318..ad91720ff1 100644
--- a/src/lib/libssl/src/crypto/evp/e_des.c
+++ b/src/lib/libssl/src/crypto/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
diff --git a/src/lib/libssl/src/crypto/evp/e_des3.c b/src/lib/libssl/src/crypto/evp/e_des3.c
index d0793b6436..3cb95a8e22 100644
--- a/src/lib/libssl/src/crypto/evp/e_des3.c
+++ b/src/lib/libssl/src/crypto/evp/e_des3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_des3.c,v 1.18 2014/10/18 17:20:40 jsing Exp $ */ 1/* $OpenBSD: e_des3.c,v 1.19 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 *
@@ -230,14 +230,8 @@ des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
230{ 230{
231 DES_cblock *deskey = (DES_cblock *)key; 231 DES_cblock *deskey = (DES_cblock *)key;
232 232
233#ifdef EVP_CHECK_DES_KEY
234 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
235 !! DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
236 return 0;
237#else
238 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); 233 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
239 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); 234 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
240#endif
241 memcpy(&data(ctx)->ks3, &data(ctx)->ks1, 235 memcpy(&data(ctx)->ks3, &data(ctx)->ks1,
242 sizeof(data(ctx)->ks1)); 236 sizeof(data(ctx)->ks1));
243 return 1; 237 return 1;
@@ -250,16 +244,9 @@ des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
250 DES_cblock *deskey = (DES_cblock *)key; 244 DES_cblock *deskey = (DES_cblock *)key;
251 245
252 246
253#ifdef EVP_CHECK_DES_KEY
254 if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) ||
255 DES_set_key_checked(&deskey[1], &data(ctx)->ks2) ||
256 DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
257 return 0;
258#else
259 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); 247 DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
260 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); 248 DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
261 DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3); 249 DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3);
262#endif
263 return 1; 250 return 1;
264} 251}
265 252
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 19:46:57 +0000