summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/des/rand_key.c16
-rw-r--r--src/lib/libssl/src/crypto/des/rand_key.c16
2 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/des/rand_key.c b/src/lib/libcrypto/des/rand_key.c
index 2dba949bad..727d36f488 100644
--- a/src/lib/libcrypto/des/rand_key.c
+++ b/src/lib/libcrypto/des/rand_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rand_key.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: rand_key.c,v 1.7 2014/07/22 18:09:20 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -56,13 +56,13 @@
56#include <openssl/des.h> 56#include <openssl/des.h>
57#include <openssl/rand.h> 57#include <openssl/rand.h>
58 58
59int DES_random_key(DES_cblock *ret) 59int
60 { 60DES_random_key(DES_cblock *ret)
61 do 61{
62 { 62 do {
63 if (RAND_bytes((unsigned char *)ret, sizeof(DES_cblock)) != 1) 63 if (RAND_bytes((unsigned char *)ret, sizeof(DES_cblock)) != 1)
64 return (0); 64 return (0);
65 } while (DES_is_weak_key(ret)); 65 DES_set_odd_parity(ret);
66 DES_set_odd_parity(ret); 66 } while (DES_is_weak_key(ret));
67 return (1); 67 return (1);
68 } 68}
diff --git a/src/lib/libssl/src/crypto/des/rand_key.c b/src/lib/libssl/src/crypto/des/rand_key.c
index 2dba949bad..727d36f488 100644
--- a/src/lib/libssl/src/crypto/des/rand_key.c
+++ b/src/lib/libssl/src/crypto/des/rand_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rand_key.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */ 1/* $OpenBSD: rand_key.c,v 1.7 2014/07/22 18:09:20 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -56,13 +56,13 @@
56#include <openssl/des.h> 56#include <openssl/des.h>
57#include <openssl/rand.h> 57#include <openssl/rand.h>
58 58
59int DES_random_key(DES_cblock *ret) 59int
60 { 60DES_random_key(DES_cblock *ret)
61 do 61{
62 { 62 do {
63 if (RAND_bytes((unsigned char *)ret, sizeof(DES_cblock)) != 1) 63 if (RAND_bytes((unsigned char *)ret, sizeof(DES_cblock)) != 1)
64 return (0); 64 return (0);
65 } while (DES_is_weak_key(ret)); 65 DES_set_odd_parity(ret);
66 DES_set_odd_parity(ret); 66 } while (DES_is_weak_key(ret));
67 return (1); 67 return (1);
68 } 68}