summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/des/str2key.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/des/str2key.c')
-rw-r--r--src/lib/libcrypto/des/str2key.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/libcrypto/des/str2key.c b/src/lib/libcrypto/des/str2key.c
index c9bd9aad1b..dd17a441b7 100644
--- a/src/lib/libcrypto/des/str2key.c
+++ b/src/lib/libcrypto/des/str2key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: str2key.c,v 1.12 2023/07/08 07:11:07 beck Exp $ */ 1/* $OpenBSD: str2key.c,v 1.13 2023/07/08 07:34:34 jsing 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 *
@@ -72,8 +72,7 @@ DES_string_to_key(const char *str, DES_cblock *key)
72 for (i = 0; i < length; i++) 72 for (i = 0; i < length; i++)
73 (*key)[i % 8] ^= (str[i] << 1); 73 (*key)[i % 8] ^= (str[i] << 1);
74#else /* MIT COMPATIBLE */ 74#else /* MIT COMPATIBLE */
75 for (i = 0; i < length; i++) 75 for (i = 0; i < length; i++) {
76 {
77 j = str[i]; 76 j = str[i];
78 if ((i % 16) < 8) 77 if ((i % 16) < 8)
79 (*key)[i % 8] ^= (j << 1); 78 (*key)[i % 8] ^= (j << 1);
@@ -111,13 +110,11 @@ DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
111 length = strlen(str); 110 length = strlen(str);
112#ifdef OLD_STR_TO_KEY 111#ifdef OLD_STR_TO_KEY
113 if (length <= 8) { 112 if (length <= 8) {
114 for (i = 0; i < length; i++) 113 for (i = 0; i < length; i++) {
115 {
116 (*key2)[i] = (*key1)[i] = (str[i] << 1); 114 (*key2)[i] = (*key1)[i] = (str[i] << 1);
117 } 115 }
118 } else { 116 } else {
119 for (i = 0; i < length; i++) 117 for (i = 0; i < length; i++) {
120 {
121 if ((i/8) & 1) 118 if ((i/8) & 1)
122 (*key2)[i % 8] ^= (str[i] << 1); 119 (*key2)[i % 8] ^= (str[i] << 1);
123 else 120 else
@@ -125,8 +122,7 @@ DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2)
125 } 122 }
126 } 123 }
127#else /* MIT COMPATIBLE */ 124#else /* MIT COMPATIBLE */
128 for (i = 0; i < length; i++) 125 for (i = 0; i < length; i++) {
129 {
130 j = str[i]; 126 j = str[i];
131 if ((i % 32) < 16) { 127 if ((i % 32) < 16) {
132 if ((i % 16) < 8) 128 if ((i % 16) < 8)