summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/libcrypto/Makefile3
-rw-r--r--src/lib/libcrypto/des/fcrypt.c136
-rw-r--r--src/lib/libcrypto/des/fcrypt_b.c145
3 files changed, 136 insertions, 148 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index bb3f415d0d..2b8fe88fcf 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.209 2024/08/31 10:44:39 tb Exp $ 1# $OpenBSD: Makefile,v 1.210 2024/08/31 15:39:33 jsing Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -261,7 +261,6 @@ SRCS+= ecb3_enc.c
261SRCS+= ecb_enc.c 261SRCS+= ecb_enc.c
262SRCS+= ede_cbcm_enc.c 262SRCS+= ede_cbcm_enc.c
263SRCS+= fcrypt.c 263SRCS+= fcrypt.c
264SRCS+= fcrypt_b.c
265SRCS+= ofb64ede.c 264SRCS+= ofb64ede.c
266SRCS+= ofb64enc.c 265SRCS+= ofb64enc.c
267SRCS+= ofb_enc.c 266SRCS+= ofb_enc.c
diff --git a/src/lib/libcrypto/des/fcrypt.c b/src/lib/libcrypto/des/fcrypt.c
index 5bdf09b7e6..c970ef4c55 100644
--- a/src/lib/libcrypto/des/fcrypt.c
+++ b/src/lib/libcrypto/des/fcrypt.c
@@ -1,4 +1,60 @@
1/* $OpenBSD: fcrypt.c,v 1.16 2024/03/29 01:47:29 joshua Exp $ */ 1/* $OpenBSD: fcrypt.c,v 1.17 2024/08/31 15:39:33 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
2 58
3#include <stdio.h> 59#include <stdio.h>
4 60
@@ -15,7 +71,85 @@
15 * defined 24. 71 * defined 24.
16 */ 72 */
17 73
74#define DES_FCRYPT
18#include "des_local.h" 75#include "des_local.h"
76#undef DES_FCRYPT
77
78#ifndef OPENBSD_DES_ASM
79
80#undef PERM_OP
81#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)), \
82 (b)^=(t), \
83 (a)^=((t)<<(n)))
84
85#undef HPERM_OP
86#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)), \
87 (a)=(a)^(t)^(t>>(16-(n)))) \
88
89void
90fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
91 DES_LONG Eswap1)
92{
93 DES_LONG l, r, t, u;
94#ifdef DES_PTR
95 const unsigned char *des_SP = (const unsigned char *)DES_SPtrans;
96#endif
97 DES_LONG *s;
98 int j;
99 DES_LONG E0, E1;
100
101 l = 0;
102 r = 0;
103
104 s = (DES_LONG *)ks;
105 E0 = Eswap0;
106 E1 = Eswap1;
107
108 for (j = 0; j < 25; j++) {
109#ifndef DES_UNROLL
110 int i;
111
112 for (i = 0; i < 32; i += 4) {
113 D_ENCRYPT(l, r, i + 0); /* 1 */
114 D_ENCRYPT(r, l, i + 2); /* 2 */
115 }
116#else
117 D_ENCRYPT(l, r, 0); /* 1 */
118 D_ENCRYPT(r, l, 2); /* 2 */
119 D_ENCRYPT(l, r, 4); /* 3 */
120 D_ENCRYPT(r, l, 6); /* 4 */
121 D_ENCRYPT(l, r, 8); /* 5 */
122 D_ENCRYPT(r, l, 10); /* 6 */
123 D_ENCRYPT(l, r, 12); /* 7 */
124 D_ENCRYPT(r, l, 14); /* 8 */
125 D_ENCRYPT(l, r, 16); /* 9 */
126 D_ENCRYPT(r, l, 18); /* 10 */
127 D_ENCRYPT(l, r, 20); /* 11 */
128 D_ENCRYPT(r, l, 22); /* 12 */
129 D_ENCRYPT(l, r, 24); /* 13 */
130 D_ENCRYPT(r, l, 26); /* 14 */
131 D_ENCRYPT(l, r, 28); /* 15 */
132 D_ENCRYPT(r, l, 30); /* 16 */
133#endif
134
135 t = l;
136 l = r;
137 r = t;
138 }
139 l = ROTATE(l, 3) & 0xffffffffL;
140 r = ROTATE(r, 3) & 0xffffffffL;
141
142 PERM_OP(l, r, t, 1, 0x55555555L);
143 PERM_OP(r, l, t, 8, 0x00ff00ffL);
144 PERM_OP(l, r, t, 2, 0x33333333L);
145 PERM_OP(r, l, t, 16, 0x0000ffffL);
146 PERM_OP(l, r, t, 4, 0x0f0f0f0fL);
147
148 out[0] = r;
149 out[1] = l;
150}
151
152#endif /* OPENBSD_DES_ASM */
19 153
20/* Added more values to handle illegal salt values the way normal 154/* Added more values to handle illegal salt values the way normal
21 * crypt() implementations do. The patch was sent by 155 * crypt() implementations do. The patch was sent by
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c
deleted file mode 100644
index 58c9bc34c5..0000000000
--- a/src/lib/libcrypto/des/fcrypt_b.c
+++ /dev/null
@@ -1,145 +0,0 @@
1/* $OpenBSD: fcrypt_b.c,v 1.12 2023/07/08 07:34:34 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60
61/* This version of crypt has been developed from my MIT compatible
62 * DES library.
63 * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
64 * Eric Young (eay@cryptsoft.com)
65 */
66
67#define DES_FCRYPT
68#include "des_local.h"
69#undef DES_FCRYPT
70
71#ifndef OPENBSD_DES_ASM
72
73#undef PERM_OP
74#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)), \
75 (b)^=(t), \
76 (a)^=((t)<<(n)))
77
78#undef HPERM_OP
79#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)), \
80 (a)=(a)^(t)^(t>>(16-(n)))) \
81
82void
83fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
84 DES_LONG Eswap1)
85{
86 DES_LONG l, r, t, u;
87#ifdef DES_PTR
88 const unsigned char *des_SP = (const unsigned char *)DES_SPtrans;
89#endif
90 DES_LONG *s;
91 int j;
92 DES_LONG E0, E1;
93
94 l = 0;
95 r = 0;
96
97 s = (DES_LONG *)ks;
98 E0 = Eswap0;
99 E1 = Eswap1;
100
101 for (j = 0; j < 25; j++) {
102#ifndef DES_UNROLL
103 int i;
104
105 for (i = 0; i < 32; i += 4) {
106 D_ENCRYPT(l, r, i + 0); /* 1 */
107 D_ENCRYPT(r, l, i + 2); /* 2 */
108 }
109#else
110 D_ENCRYPT(l, r, 0); /* 1 */
111 D_ENCRYPT(r, l, 2); /* 2 */
112 D_ENCRYPT(l, r, 4); /* 3 */
113 D_ENCRYPT(r, l, 6); /* 4 */
114 D_ENCRYPT(l, r, 8); /* 5 */
115 D_ENCRYPT(r, l, 10); /* 6 */
116 D_ENCRYPT(l, r, 12); /* 7 */
117 D_ENCRYPT(r, l, 14); /* 8 */
118 D_ENCRYPT(l, r, 16); /* 9 */
119 D_ENCRYPT(r, l, 18); /* 10 */
120 D_ENCRYPT(l, r, 20); /* 11 */
121 D_ENCRYPT(r, l, 22); /* 12 */
122 D_ENCRYPT(l, r, 24); /* 13 */
123 D_ENCRYPT(r, l, 26); /* 14 */
124 D_ENCRYPT(l, r, 28); /* 15 */
125 D_ENCRYPT(r, l, 30); /* 16 */
126#endif
127
128 t = l;
129 l = r;
130 r = t;
131 }
132 l = ROTATE(l, 3) & 0xffffffffL;
133 r = ROTATE(r, 3) & 0xffffffffL;
134
135 PERM_OP(l, r, t, 1, 0x55555555L);
136 PERM_OP(r, l, t, 8, 0x00ff00ffL);
137 PERM_OP(l, r, t, 2, 0x33333333L);
138 PERM_OP(r, l, t, 16, 0x0000ffffL);
139 PERM_OP(l, r, t, 4, 0x0f0f0f0fL);
140
141 out[0] = r;
142 out[1] = l;
143}
144
145#endif /* OPENBSD_DES_ASM */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 17:35:17 +0000