diff options
-rw-r--r-- | src/lib/libcrypto/crypto/Makefile | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_err.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_lib.c | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_null.c | 157 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_eay.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_err.c | 8 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_lib.c | 9 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_null.c | 157 |
9 files changed, 10 insertions, 354 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index a39cb36fb4..43d6366651 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.42 2014/07/08 16:07:37 miod Exp $ | 1 | # $OpenBSD: Makefile,v 1.43 2014/07/09 08:44:53 miod Exp $ |
2 | 2 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | 4 | ||
@@ -219,7 +219,7 @@ SRCS+= rmd_dgst.c rmd_one.c | |||
219 | 219 | ||
220 | # rsa/ | 220 | # rsa/ |
221 | SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c | 221 | SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c |
222 | SRCS+= rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c | 222 | SRCS+= rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c |
223 | SRCS+= rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c | 223 | SRCS+= rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c |
224 | SRCS+= rsa_pmeth.c rsa_crpt.c | 224 | SRCS+= rsa_pmeth.c rsa_crpt.c |
225 | 225 | ||
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index 7b294e761e..06bd8ded96 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_eay.c,v 1.29 2014/07/09 08:20:08 miod Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.30 2014/07/09 08:44:53 miod 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 | * |
@@ -115,8 +115,6 @@ | |||
115 | #include <openssl/rsa.h> | 115 | #include <openssl/rsa.h> |
116 | #include <openssl/rand.h> | 116 | #include <openssl/rand.h> |
117 | 117 | ||
118 | #ifndef RSA_NULL | ||
119 | |||
120 | static int RSA_eay_public_encrypt(int flen, const unsigned char *from, | 118 | static int RSA_eay_public_encrypt(int flen, const unsigned char *from, |
121 | unsigned char *to, RSA *rsa,int padding); | 119 | unsigned char *to, RSA *rsa,int padding); |
122 | static int RSA_eay_private_encrypt(int flen, const unsigned char *from, | 120 | static int RSA_eay_private_encrypt(int flen, const unsigned char *from, |
@@ -906,5 +904,3 @@ RSA_eay_finish(RSA *rsa) | |||
906 | BN_MONT_CTX_free(rsa->_method_mod_q); | 904 | BN_MONT_CTX_free(rsa->_method_mod_q); |
907 | return 1; | 905 | return 1; |
908 | } | 906 | } |
909 | |||
910 | #endif | ||
diff --git a/src/lib/libcrypto/rsa/rsa_err.c b/src/lib/libcrypto/rsa/rsa_err.c index ab5a4449fc..c7d6881100 100644 --- a/src/lib/libcrypto/rsa/rsa_err.c +++ b/src/lib/libcrypto/rsa/rsa_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_err.c,v 1.12 2014/06/12 15:49:30 deraadt Exp $ */ | 1 | /* $OpenBSD: rsa_err.c,v 1.13 2014/07/09 08:44:53 miod Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -91,12 +91,6 @@ static ERR_STRING_DATA RSA_str_functs[]= | |||
91 | {ERR_FUNC(RSA_F_RSA_ITEM_VERIFY), "RSA_ITEM_VERIFY"}, | 91 | {ERR_FUNC(RSA_F_RSA_ITEM_VERIFY), "RSA_ITEM_VERIFY"}, |
92 | {ERR_FUNC(RSA_F_RSA_MEMORY_LOCK), "RSA_memory_lock"}, | 92 | {ERR_FUNC(RSA_F_RSA_MEMORY_LOCK), "RSA_memory_lock"}, |
93 | {ERR_FUNC(RSA_F_RSA_NEW_METHOD), "RSA_new_method"}, | 93 | {ERR_FUNC(RSA_F_RSA_NEW_METHOD), "RSA_new_method"}, |
94 | {ERR_FUNC(RSA_F_RSA_NULL), "RSA_NULL"}, | ||
95 | {ERR_FUNC(RSA_F_RSA_NULL_MOD_EXP), "RSA_NULL_MOD_EXP"}, | ||
96 | {ERR_FUNC(RSA_F_RSA_NULL_PRIVATE_DECRYPT), "RSA_NULL_PRIVATE_DECRYPT"}, | ||
97 | {ERR_FUNC(RSA_F_RSA_NULL_PRIVATE_ENCRYPT), "RSA_NULL_PRIVATE_ENCRYPT"}, | ||
98 | {ERR_FUNC(RSA_F_RSA_NULL_PUBLIC_DECRYPT), "RSA_NULL_PUBLIC_DECRYPT"}, | ||
99 | {ERR_FUNC(RSA_F_RSA_NULL_PUBLIC_ENCRYPT), "RSA_NULL_PUBLIC_ENCRYPT"}, | ||
100 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_NONE), "RSA_padding_add_none"}, | 94 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_NONE), "RSA_padding_add_none"}, |
101 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP), "RSA_padding_add_PKCS1_OAEP"}, | 95 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP), "RSA_padding_add_PKCS1_OAEP"}, |
102 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_PSS), "RSA_padding_add_PKCS1_PSS"}, | 96 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_PSS), "RSA_padding_add_PKCS1_PSS"}, |
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c index 054690cee6..5ccdfe9810 100644 --- a/src/lib/libcrypto/rsa/rsa_lib.c +++ b/src/lib/libcrypto/rsa/rsa_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_lib.c,v 1.21 2014/07/09 08:20:08 miod Exp $ */ | 1 | /* $OpenBSD: rsa_lib.c,v 1.22 2014/07/09 08:44:53 miod 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 | * |
@@ -88,13 +88,8 @@ RSA_set_default_method(const RSA_METHOD *meth) | |||
88 | const RSA_METHOD * | 88 | const RSA_METHOD * |
89 | RSA_get_default_method(void) | 89 | RSA_get_default_method(void) |
90 | { | 90 | { |
91 | if (default_RSA_meth == NULL) { | 91 | if (default_RSA_meth == NULL) |
92 | #ifdef RSA_NULL | ||
93 | default_RSA_meth = RSA_null_method(); | ||
94 | #else | ||
95 | default_RSA_meth = RSA_PKCS1_SSLeay(); | 92 | default_RSA_meth = RSA_PKCS1_SSLeay(); |
96 | #endif | ||
97 | } | ||
98 | 93 | ||
99 | return default_RSA_meth; | 94 | return default_RSA_meth; |
100 | } | 95 | } |
diff --git a/src/lib/libcrypto/rsa/rsa_null.c b/src/lib/libcrypto/rsa/rsa_null.c deleted file mode 100644 index 54f1cabc74..0000000000 --- a/src/lib/libcrypto/rsa/rsa_null.c +++ /dev/null | |||
@@ -1,157 +0,0 @@ | |||
1 | /* $OpenBSD: rsa_null.c,v 1.7 2014/07/09 08:20:08 miod Exp $ */ | ||
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/rsa.h> | ||
63 | #include <openssl/rand.h> | ||
64 | |||
65 | /* | ||
66 | * This is a dummy RSA implementation that just returns errors when called. | ||
67 | * It is designed to allow some RSA functions to work while stopping those | ||
68 | * covered by the RSA patent. That is RSA, encryption, decryption, signing | ||
69 | * and verify is not allowed but RSA key generation, key checking and other | ||
70 | * operations (like storing RSA keys) are permitted. | ||
71 | */ | ||
72 | |||
73 | static int RSA_null_public_encrypt(int flen, const unsigned char *from, | ||
74 | unsigned char *to, RSA *rsa,int padding); | ||
75 | static int RSA_null_private_encrypt(int flen, const unsigned char *from, | ||
76 | unsigned char *to, RSA *rsa,int padding); | ||
77 | static int RSA_null_public_decrypt(int flen, const unsigned char *from, | ||
78 | unsigned char *to, RSA *rsa,int padding); | ||
79 | static int RSA_null_private_decrypt(int flen, const unsigned char *from, | ||
80 | unsigned char *to, RSA *rsa,int padding); | ||
81 | #if 0 /* not currently used */ | ||
82 | static int RSA_null_mod_exp(const BIGNUM *r0, const BIGNUM *i, RSA *rsa); | ||
83 | #endif | ||
84 | static int RSA_null_init(RSA *rsa); | ||
85 | static int RSA_null_finish(RSA *rsa); | ||
86 | static RSA_METHOD rsa_null_meth = { | ||
87 | .name = "Null RSA", | ||
88 | .rsa_pub_enc = RSA_null_public_encrypt, | ||
89 | .rsa_pub_dec = RSA_null_public_decrypt, | ||
90 | .rsa_priv_enc = RSA_null_private_encrypt, | ||
91 | .rsa_priv_dec = RSA_null_private_decrypt, | ||
92 | .init = RSA_null_init, | ||
93 | .finish = RSA_null_finish, | ||
94 | }; | ||
95 | |||
96 | const RSA_METHOD * | ||
97 | RSA_null_method(void) | ||
98 | { | ||
99 | return &rsa_null_meth; | ||
100 | } | ||
101 | |||
102 | static int | ||
103 | RSA_null_public_encrypt(int flen, const unsigned char *from, unsigned char *to, | ||
104 | RSA *rsa, int padding) | ||
105 | { | ||
106 | RSAerr(RSA_F_RSA_NULL_PUBLIC_ENCRYPT, | ||
107 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
108 | return -1; | ||
109 | } | ||
110 | |||
111 | static int | ||
112 | RSA_null_private_encrypt(int flen, const unsigned char *from, unsigned char *to, | ||
113 | RSA *rsa, int padding) | ||
114 | { | ||
115 | RSAerr(RSA_F_RSA_NULL_PRIVATE_ENCRYPT, | ||
116 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
117 | return -1; | ||
118 | } | ||
119 | |||
120 | static int | ||
121 | RSA_null_private_decrypt(int flen, const unsigned char *from, unsigned char *to, | ||
122 | RSA *rsa, int padding) | ||
123 | { | ||
124 | RSAerr(RSA_F_RSA_NULL_PRIVATE_DECRYPT, | ||
125 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
126 | return -1; | ||
127 | } | ||
128 | |||
129 | static int | ||
130 | RSA_null_public_decrypt(int flen, const unsigned char *from, unsigned char *to, | ||
131 | RSA *rsa, int padding) | ||
132 | { | ||
133 | RSAerr(RSA_F_RSA_NULL_PUBLIC_DECRYPT, | ||
134 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
135 | return -1; | ||
136 | } | ||
137 | |||
138 | #if 0 /* not currently used */ | ||
139 | static int | ||
140 | RSA_null_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa) | ||
141 | { | ||
142 | ...err(RSA_F_RSA_NULL_MOD_EXP, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
143 | return -1; | ||
144 | } | ||
145 | #endif | ||
146 | |||
147 | static int | ||
148 | RSA_null_init(RSA *rsa) | ||
149 | { | ||
150 | return 1; | ||
151 | } | ||
152 | |||
153 | static int | ||
154 | RSA_null_finish(RSA *rsa) | ||
155 | { | ||
156 | return 1; | ||
157 | } | ||
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c index 7b294e761e..06bd8ded96 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_eay.c,v 1.29 2014/07/09 08:20:08 miod Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.30 2014/07/09 08:44:53 miod 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 | * |
@@ -115,8 +115,6 @@ | |||
115 | #include <openssl/rsa.h> | 115 | #include <openssl/rsa.h> |
116 | #include <openssl/rand.h> | 116 | #include <openssl/rand.h> |
117 | 117 | ||
118 | #ifndef RSA_NULL | ||
119 | |||
120 | static int RSA_eay_public_encrypt(int flen, const unsigned char *from, | 118 | static int RSA_eay_public_encrypt(int flen, const unsigned char *from, |
121 | unsigned char *to, RSA *rsa,int padding); | 119 | unsigned char *to, RSA *rsa,int padding); |
122 | static int RSA_eay_private_encrypt(int flen, const unsigned char *from, | 120 | static int RSA_eay_private_encrypt(int flen, const unsigned char *from, |
@@ -906,5 +904,3 @@ RSA_eay_finish(RSA *rsa) | |||
906 | BN_MONT_CTX_free(rsa->_method_mod_q); | 904 | BN_MONT_CTX_free(rsa->_method_mod_q); |
907 | return 1; | 905 | return 1; |
908 | } | 906 | } |
909 | |||
910 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_err.c b/src/lib/libssl/src/crypto/rsa/rsa_err.c index ab5a4449fc..c7d6881100 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_err.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_err.c,v 1.12 2014/06/12 15:49:30 deraadt Exp $ */ | 1 | /* $OpenBSD: rsa_err.c,v 1.13 2014/07/09 08:44:53 miod Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -91,12 +91,6 @@ static ERR_STRING_DATA RSA_str_functs[]= | |||
91 | {ERR_FUNC(RSA_F_RSA_ITEM_VERIFY), "RSA_ITEM_VERIFY"}, | 91 | {ERR_FUNC(RSA_F_RSA_ITEM_VERIFY), "RSA_ITEM_VERIFY"}, |
92 | {ERR_FUNC(RSA_F_RSA_MEMORY_LOCK), "RSA_memory_lock"}, | 92 | {ERR_FUNC(RSA_F_RSA_MEMORY_LOCK), "RSA_memory_lock"}, |
93 | {ERR_FUNC(RSA_F_RSA_NEW_METHOD), "RSA_new_method"}, | 93 | {ERR_FUNC(RSA_F_RSA_NEW_METHOD), "RSA_new_method"}, |
94 | {ERR_FUNC(RSA_F_RSA_NULL), "RSA_NULL"}, | ||
95 | {ERR_FUNC(RSA_F_RSA_NULL_MOD_EXP), "RSA_NULL_MOD_EXP"}, | ||
96 | {ERR_FUNC(RSA_F_RSA_NULL_PRIVATE_DECRYPT), "RSA_NULL_PRIVATE_DECRYPT"}, | ||
97 | {ERR_FUNC(RSA_F_RSA_NULL_PRIVATE_ENCRYPT), "RSA_NULL_PRIVATE_ENCRYPT"}, | ||
98 | {ERR_FUNC(RSA_F_RSA_NULL_PUBLIC_DECRYPT), "RSA_NULL_PUBLIC_DECRYPT"}, | ||
99 | {ERR_FUNC(RSA_F_RSA_NULL_PUBLIC_ENCRYPT), "RSA_NULL_PUBLIC_ENCRYPT"}, | ||
100 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_NONE), "RSA_padding_add_none"}, | 94 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_NONE), "RSA_padding_add_none"}, |
101 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP), "RSA_padding_add_PKCS1_OAEP"}, | 95 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP), "RSA_padding_add_PKCS1_OAEP"}, |
102 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_PSS), "RSA_padding_add_PKCS1_PSS"}, | 96 | {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_PSS), "RSA_padding_add_PKCS1_PSS"}, |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_lib.c b/src/lib/libssl/src/crypto/rsa/rsa_lib.c index 054690cee6..5ccdfe9810 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_lib.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_lib.c,v 1.21 2014/07/09 08:20:08 miod Exp $ */ | 1 | /* $OpenBSD: rsa_lib.c,v 1.22 2014/07/09 08:44:53 miod 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 | * |
@@ -88,13 +88,8 @@ RSA_set_default_method(const RSA_METHOD *meth) | |||
88 | const RSA_METHOD * | 88 | const RSA_METHOD * |
89 | RSA_get_default_method(void) | 89 | RSA_get_default_method(void) |
90 | { | 90 | { |
91 | if (default_RSA_meth == NULL) { | 91 | if (default_RSA_meth == NULL) |
92 | #ifdef RSA_NULL | ||
93 | default_RSA_meth = RSA_null_method(); | ||
94 | #else | ||
95 | default_RSA_meth = RSA_PKCS1_SSLeay(); | 92 | default_RSA_meth = RSA_PKCS1_SSLeay(); |
96 | #endif | ||
97 | } | ||
98 | 93 | ||
99 | return default_RSA_meth; | 94 | return default_RSA_meth; |
100 | } | 95 | } |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_null.c b/src/lib/libssl/src/crypto/rsa/rsa_null.c deleted file mode 100644 index 54f1cabc74..0000000000 --- a/src/lib/libssl/src/crypto/rsa/rsa_null.c +++ /dev/null | |||
@@ -1,157 +0,0 @@ | |||
1 | /* $OpenBSD: rsa_null.c,v 1.7 2014/07/09 08:20:08 miod Exp $ */ | ||
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
3 | * project 1999. | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/rsa.h> | ||
63 | #include <openssl/rand.h> | ||
64 | |||
65 | /* | ||
66 | * This is a dummy RSA implementation that just returns errors when called. | ||
67 | * It is designed to allow some RSA functions to work while stopping those | ||
68 | * covered by the RSA patent. That is RSA, encryption, decryption, signing | ||
69 | * and verify is not allowed but RSA key generation, key checking and other | ||
70 | * operations (like storing RSA keys) are permitted. | ||
71 | */ | ||
72 | |||
73 | static int RSA_null_public_encrypt(int flen, const unsigned char *from, | ||
74 | unsigned char *to, RSA *rsa,int padding); | ||
75 | static int RSA_null_private_encrypt(int flen, const unsigned char *from, | ||
76 | unsigned char *to, RSA *rsa,int padding); | ||
77 | static int RSA_null_public_decrypt(int flen, const unsigned char *from, | ||
78 | unsigned char *to, RSA *rsa,int padding); | ||
79 | static int RSA_null_private_decrypt(int flen, const unsigned char *from, | ||
80 | unsigned char *to, RSA *rsa,int padding); | ||
81 | #if 0 /* not currently used */ | ||
82 | static int RSA_null_mod_exp(const BIGNUM *r0, const BIGNUM *i, RSA *rsa); | ||
83 | #endif | ||
84 | static int RSA_null_init(RSA *rsa); | ||
85 | static int RSA_null_finish(RSA *rsa); | ||
86 | static RSA_METHOD rsa_null_meth = { | ||
87 | .name = "Null RSA", | ||
88 | .rsa_pub_enc = RSA_null_public_encrypt, | ||
89 | .rsa_pub_dec = RSA_null_public_decrypt, | ||
90 | .rsa_priv_enc = RSA_null_private_encrypt, | ||
91 | .rsa_priv_dec = RSA_null_private_decrypt, | ||
92 | .init = RSA_null_init, | ||
93 | .finish = RSA_null_finish, | ||
94 | }; | ||
95 | |||
96 | const RSA_METHOD * | ||
97 | RSA_null_method(void) | ||
98 | { | ||
99 | return &rsa_null_meth; | ||
100 | } | ||
101 | |||
102 | static int | ||
103 | RSA_null_public_encrypt(int flen, const unsigned char *from, unsigned char *to, | ||
104 | RSA *rsa, int padding) | ||
105 | { | ||
106 | RSAerr(RSA_F_RSA_NULL_PUBLIC_ENCRYPT, | ||
107 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
108 | return -1; | ||
109 | } | ||
110 | |||
111 | static int | ||
112 | RSA_null_private_encrypt(int flen, const unsigned char *from, unsigned char *to, | ||
113 | RSA *rsa, int padding) | ||
114 | { | ||
115 | RSAerr(RSA_F_RSA_NULL_PRIVATE_ENCRYPT, | ||
116 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
117 | return -1; | ||
118 | } | ||
119 | |||
120 | static int | ||
121 | RSA_null_private_decrypt(int flen, const unsigned char *from, unsigned char *to, | ||
122 | RSA *rsa, int padding) | ||
123 | { | ||
124 | RSAerr(RSA_F_RSA_NULL_PRIVATE_DECRYPT, | ||
125 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
126 | return -1; | ||
127 | } | ||
128 | |||
129 | static int | ||
130 | RSA_null_public_decrypt(int flen, const unsigned char *from, unsigned char *to, | ||
131 | RSA *rsa, int padding) | ||
132 | { | ||
133 | RSAerr(RSA_F_RSA_NULL_PUBLIC_DECRYPT, | ||
134 | RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
135 | return -1; | ||
136 | } | ||
137 | |||
138 | #if 0 /* not currently used */ | ||
139 | static int | ||
140 | RSA_null_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa) | ||
141 | { | ||
142 | ...err(RSA_F_RSA_NULL_MOD_EXP, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED); | ||
143 | return -1; | ||
144 | } | ||
145 | #endif | ||
146 | |||
147 | static int | ||
148 | RSA_null_init(RSA *rsa) | ||
149 | { | ||
150 | return 1; | ||
151 | } | ||
152 | |||
153 | static int | ||
154 | RSA_null_finish(RSA *rsa) | ||
155 | { | ||
156 | return 1; | ||
157 | } | ||