diff options
author | miod <> | 2014-07-08 16:07:37 +0000 |
---|---|---|
committer | miod <> | 2014-07-08 16:07:37 +0000 |
commit | af8338d595a389c88f2f13ce7143cb6d317fabb8 (patch) | |
tree | ebb8e5d2a9007ee57f76d37250abc39f6442d22a /src | |
parent | 90d37d3c78a6848be337bcc7eaaaad0764c52d80 (diff) | |
download | openbsd-af8338d595a389c88f2f13ce7143cb6d317fabb8.tar.gz openbsd-af8338d595a389c88f2f13ce7143cb6d317fabb8.tar.bz2 openbsd-af8338d595a389c88f2f13ce7143cb6d317fabb8.zip |
Remove undocumented _des_crypt() interface and its companion header file,
which had never been installed, so it's unlikely something ever used this
in the last 15~20 years.
ok deraadt@ jsing@ beck@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/crypto/Makefile | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/des/rpc_des.h | 133 | ||||
-rw-r--r-- | src/lib/libcrypto/des/rpc_enc.c | 98 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/rpc_des.h | 133 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/rpc_enc.c | 98 |
5 files changed, 2 insertions, 464 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index 514c563c13..a39cb36fb4 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.41 2014/06/24 19:31:50 miod Exp $ | 1 | # $OpenBSD: Makefile,v 1.42 2014/07/08 16:07:37 miod Exp $ |
2 | 2 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | 4 | ||
@@ -99,7 +99,7 @@ SRCS+= conf_mall.c conf_sap.c | |||
99 | SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c | 99 | SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c |
100 | SRCS+= ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c | 100 | SRCS+= ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c |
101 | SRCS+= fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c | 101 | SRCS+= fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c |
102 | SRCS+= qud_cksm.c rand_key.c rpc_enc.c set_key.c xcbc_enc.c | 102 | SRCS+= qud_cksm.c rand_key.c set_key.c xcbc_enc.c |
103 | SRCS+= str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c | 103 | SRCS+= str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c |
104 | 104 | ||
105 | # dh/ | 105 | # dh/ |
diff --git a/src/lib/libcrypto/des/rpc_des.h b/src/lib/libcrypto/des/rpc_des.h deleted file mode 100644 index 1ea5889d44..0000000000 --- a/src/lib/libcrypto/des/rpc_des.h +++ /dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | /* $OpenBSD: rpc_des.h,v 1.4 2014/06/12 15:49:28 deraadt 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 | /* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */ | ||
60 | /* | ||
61 | * Copyright (c) 2010, Oracle America, Inc. | ||
62 | * | ||
63 | * Redistribution and use in source and binary forms, with or without | ||
64 | * modification, are permitted provided that the following conditions are | ||
65 | * met: | ||
66 | * | ||
67 | * * Redistributions of source code must retain the above copyright | ||
68 | * notice, this list of conditions and the following disclaimer. | ||
69 | * * Redistributions in binary form must reproduce the above | ||
70 | * copyright notice, this list of conditions and the following | ||
71 | * disclaimer in the documentation and/or other materials | ||
72 | * provided with the distribution. | ||
73 | * * Neither the name of the "Oracle America, Inc." nor the names of its | ||
74 | * contributors may be used to endorse or promote products derived | ||
75 | * from this software without specific prior written permission. | ||
76 | * | ||
77 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
78 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
79 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | ||
80 | * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
81 | * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, | ||
82 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
83 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE | ||
84 | * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
85 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
86 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
87 | * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
88 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
89 | */ | ||
90 | |||
91 | /* | ||
92 | * Generic DES driver interface | ||
93 | * Keep this file hardware independent! | ||
94 | */ | ||
95 | |||
96 | #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ | ||
97 | #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ | ||
98 | |||
99 | #ifdef HEADER_DES_H | ||
100 | #undef ENCRYPT | ||
101 | #undef DECRYPT | ||
102 | #endif | ||
103 | |||
104 | enum desdir { ENCRYPT, DECRYPT }; | ||
105 | enum desmode { CBC, ECB }; | ||
106 | |||
107 | /* | ||
108 | * parameters to ioctl call | ||
109 | */ | ||
110 | struct desparams { | ||
111 | unsigned char des_key[8]; /* key (with low bit parity) */ | ||
112 | enum desdir des_dir; /* direction */ | ||
113 | enum desmode des_mode; /* mode */ | ||
114 | unsigned char des_ivec[8]; /* input vector */ | ||
115 | unsigned des_len; /* number of bytes to crypt */ | ||
116 | union { | ||
117 | unsigned char UDES_data[DES_QUICKLEN]; | ||
118 | unsigned char *UDES_buf; | ||
119 | } UDES; | ||
120 | # define des_data UDES.UDES_data /* direct data here if quick */ | ||
121 | # define des_buf UDES.UDES_buf /* otherwise, pointer to data */ | ||
122 | }; | ||
123 | |||
124 | /* | ||
125 | * Encrypt an arbitrary sized buffer | ||
126 | */ | ||
127 | #define DESIOCBLOCK _IOWR('d', 6, struct desparams) | ||
128 | |||
129 | /* | ||
130 | * Encrypt of small amount of data, quickly | ||
131 | */ | ||
132 | #define DESIOCQUICK _IOWR('d', 7, struct desparams) | ||
133 | |||
diff --git a/src/lib/libcrypto/des/rpc_enc.c b/src/lib/libcrypto/des/rpc_enc.c deleted file mode 100644 index c45d9789cf..0000000000 --- a/src/lib/libcrypto/des/rpc_enc.c +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | /* $OpenBSD: rpc_enc.c,v 1.5 2014/06/12 15:49:28 deraadt 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 "rpc_des.h" | ||
60 | #include "des_locl.h" | ||
61 | #include "des_ver.h" | ||
62 | |||
63 | int _des_crypt(char *buf,int len,struct desparams *desp); | ||
64 | int _des_crypt(char *buf, int len, struct desparams *desp) | ||
65 | { | ||
66 | DES_key_schedule ks; | ||
67 | int enc; | ||
68 | |||
69 | DES_set_key_unchecked(&desp->des_key,&ks); | ||
70 | enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT; | ||
71 | |||
72 | if (desp->des_mode == CBC) | ||
73 | DES_ecb_encrypt((const_DES_cblock *)desp->UDES.UDES_buf, | ||
74 | (DES_cblock *)desp->UDES.UDES_buf,&ks, | ||
75 | enc); | ||
76 | else | ||
77 | { | ||
78 | DES_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf, | ||
79 | len,&ks,&desp->des_ivec,enc); | ||
80 | #ifdef undef | ||
81 | /* len will always be %8 if called from common_crypt | ||
82 | * in secure_rpc. | ||
83 | * Libdes's cbc encrypt does not copy back the iv, | ||
84 | * so we have to do it here. */ | ||
85 | /* It does now :-) eay 20/09/95 */ | ||
86 | |||
87 | a=(char *)&(desp->UDES.UDES_buf[len-8]); | ||
88 | b=(char *)&(desp->des_ivec[0]); | ||
89 | |||
90 | *(a++)= *(b++); *(a++)= *(b++); | ||
91 | *(a++)= *(b++); *(a++)= *(b++); | ||
92 | *(a++)= *(b++); *(a++)= *(b++); | ||
93 | *(a++)= *(b++); *(a++)= *(b++); | ||
94 | #endif | ||
95 | } | ||
96 | return(1); | ||
97 | } | ||
98 | |||
diff --git a/src/lib/libssl/src/crypto/des/rpc_des.h b/src/lib/libssl/src/crypto/des/rpc_des.h deleted file mode 100644 index 1ea5889d44..0000000000 --- a/src/lib/libssl/src/crypto/des/rpc_des.h +++ /dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | /* $OpenBSD: rpc_des.h,v 1.4 2014/06/12 15:49:28 deraadt 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 | /* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */ | ||
60 | /* | ||
61 | * Copyright (c) 2010, Oracle America, Inc. | ||
62 | * | ||
63 | * Redistribution and use in source and binary forms, with or without | ||
64 | * modification, are permitted provided that the following conditions are | ||
65 | * met: | ||
66 | * | ||
67 | * * Redistributions of source code must retain the above copyright | ||
68 | * notice, this list of conditions and the following disclaimer. | ||
69 | * * Redistributions in binary form must reproduce the above | ||
70 | * copyright notice, this list of conditions and the following | ||
71 | * disclaimer in the documentation and/or other materials | ||
72 | * provided with the distribution. | ||
73 | * * Neither the name of the "Oracle America, Inc." nor the names of its | ||
74 | * contributors may be used to endorse or promote products derived | ||
75 | * from this software without specific prior written permission. | ||
76 | * | ||
77 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
78 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
79 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | ||
80 | * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
81 | * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, | ||
82 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
83 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE | ||
84 | * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
85 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
86 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
87 | * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
88 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
89 | */ | ||
90 | |||
91 | /* | ||
92 | * Generic DES driver interface | ||
93 | * Keep this file hardware independent! | ||
94 | */ | ||
95 | |||
96 | #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ | ||
97 | #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ | ||
98 | |||
99 | #ifdef HEADER_DES_H | ||
100 | #undef ENCRYPT | ||
101 | #undef DECRYPT | ||
102 | #endif | ||
103 | |||
104 | enum desdir { ENCRYPT, DECRYPT }; | ||
105 | enum desmode { CBC, ECB }; | ||
106 | |||
107 | /* | ||
108 | * parameters to ioctl call | ||
109 | */ | ||
110 | struct desparams { | ||
111 | unsigned char des_key[8]; /* key (with low bit parity) */ | ||
112 | enum desdir des_dir; /* direction */ | ||
113 | enum desmode des_mode; /* mode */ | ||
114 | unsigned char des_ivec[8]; /* input vector */ | ||
115 | unsigned des_len; /* number of bytes to crypt */ | ||
116 | union { | ||
117 | unsigned char UDES_data[DES_QUICKLEN]; | ||
118 | unsigned char *UDES_buf; | ||
119 | } UDES; | ||
120 | # define des_data UDES.UDES_data /* direct data here if quick */ | ||
121 | # define des_buf UDES.UDES_buf /* otherwise, pointer to data */ | ||
122 | }; | ||
123 | |||
124 | /* | ||
125 | * Encrypt an arbitrary sized buffer | ||
126 | */ | ||
127 | #define DESIOCBLOCK _IOWR('d', 6, struct desparams) | ||
128 | |||
129 | /* | ||
130 | * Encrypt of small amount of data, quickly | ||
131 | */ | ||
132 | #define DESIOCQUICK _IOWR('d', 7, struct desparams) | ||
133 | |||
diff --git a/src/lib/libssl/src/crypto/des/rpc_enc.c b/src/lib/libssl/src/crypto/des/rpc_enc.c deleted file mode 100644 index c45d9789cf..0000000000 --- a/src/lib/libssl/src/crypto/des/rpc_enc.c +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | /* $OpenBSD: rpc_enc.c,v 1.5 2014/06/12 15:49:28 deraadt 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 "rpc_des.h" | ||
60 | #include "des_locl.h" | ||
61 | #include "des_ver.h" | ||
62 | |||
63 | int _des_crypt(char *buf,int len,struct desparams *desp); | ||
64 | int _des_crypt(char *buf, int len, struct desparams *desp) | ||
65 | { | ||
66 | DES_key_schedule ks; | ||
67 | int enc; | ||
68 | |||
69 | DES_set_key_unchecked(&desp->des_key,&ks); | ||
70 | enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT; | ||
71 | |||
72 | if (desp->des_mode == CBC) | ||
73 | DES_ecb_encrypt((const_DES_cblock *)desp->UDES.UDES_buf, | ||
74 | (DES_cblock *)desp->UDES.UDES_buf,&ks, | ||
75 | enc); | ||
76 | else | ||
77 | { | ||
78 | DES_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf, | ||
79 | len,&ks,&desp->des_ivec,enc); | ||
80 | #ifdef undef | ||
81 | /* len will always be %8 if called from common_crypt | ||
82 | * in secure_rpc. | ||
83 | * Libdes's cbc encrypt does not copy back the iv, | ||
84 | * so we have to do it here. */ | ||
85 | /* It does now :-) eay 20/09/95 */ | ||
86 | |||
87 | a=(char *)&(desp->UDES.UDES_buf[len-8]); | ||
88 | b=(char *)&(desp->des_ivec[0]); | ||
89 | |||
90 | *(a++)= *(b++); *(a++)= *(b++); | ||
91 | *(a++)= *(b++); *(a++)= *(b++); | ||
92 | *(a++)= *(b++); *(a++)= *(b++); | ||
93 | *(a++)= *(b++); *(a++)= *(b++); | ||
94 | #endif | ||
95 | } | ||
96 | return(1); | ||
97 | } | ||
98 | |||