diff options
Diffstat (limited to 'src/lib/libcrypto/engine/eng_fat.c')
-rw-r--r-- | src/lib/libcrypto/engine/eng_fat.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c index 27c1662f62..7ccf7022ee 100644 --- a/src/lib/libcrypto/engine/eng_fat.c +++ b/src/lib/libcrypto/engine/eng_fat.c | |||
@@ -52,13 +52,11 @@ | |||
52 | * Hudson (tjh@cryptsoft.com). | 52 | * Hudson (tjh@cryptsoft.com). |
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | /* ==================================================================== | ||
56 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | ||
57 | * ECDH support in OpenSSL originally developed by | ||
58 | * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. | ||
59 | */ | ||
60 | 55 | ||
56 | #include <openssl/crypto.h> | ||
57 | #include "cryptlib.h" | ||
61 | #include "eng_int.h" | 58 | #include "eng_int.h" |
59 | #include <openssl/engine.h> | ||
62 | #include <openssl/conf.h> | 60 | #include <openssl/conf.h> |
63 | 61 | ||
64 | int ENGINE_set_default(ENGINE *e, unsigned int flags) | 62 | int ENGINE_set_default(ENGINE *e, unsigned int flags) |
@@ -79,14 +77,6 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags) | |||
79 | if((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e)) | 77 | if((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e)) |
80 | return 0; | 78 | return 0; |
81 | #endif | 79 | #endif |
82 | #ifndef OPENSSL_NO_ECDH | ||
83 | if((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e)) | ||
84 | return 0; | ||
85 | #endif | ||
86 | #ifndef OPENSSL_NO_ECDSA | ||
87 | if((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e)) | ||
88 | return 0; | ||
89 | #endif | ||
90 | if((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e)) | 80 | if((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e)) |
91 | return 0; | 81 | return 0; |
92 | return 1; | 82 | return 1; |
@@ -103,10 +93,6 @@ static int int_def_cb(const char *alg, int len, void *arg) | |||
103 | *pflags |= ENGINE_METHOD_RSA; | 93 | *pflags |= ENGINE_METHOD_RSA; |
104 | else if (!strncmp(alg, "DSA", len)) | 94 | else if (!strncmp(alg, "DSA", len)) |
105 | *pflags |= ENGINE_METHOD_DSA; | 95 | *pflags |= ENGINE_METHOD_DSA; |
106 | else if (!strncmp(alg, "ECDH", len)) | ||
107 | *pflags |= ENGINE_METHOD_ECDH; | ||
108 | else if (!strncmp(alg, "ECDSA", len)) | ||
109 | *pflags |= ENGINE_METHOD_ECDSA; | ||
110 | else if (!strncmp(alg, "DH", len)) | 96 | else if (!strncmp(alg, "DH", len)) |
111 | *pflags |= ENGINE_METHOD_DH; | 97 | *pflags |= ENGINE_METHOD_DH; |
112 | else if (!strncmp(alg, "RAND", len)) | 98 | else if (!strncmp(alg, "RAND", len)) |
@@ -147,12 +133,6 @@ int ENGINE_register_complete(ENGINE *e) | |||
147 | #ifndef OPENSSL_NO_DH | 133 | #ifndef OPENSSL_NO_DH |
148 | ENGINE_register_DH(e); | 134 | ENGINE_register_DH(e); |
149 | #endif | 135 | #endif |
150 | #ifndef OPENSSL_NO_ECDH | ||
151 | ENGINE_register_ECDH(e); | ||
152 | #endif | ||
153 | #ifndef OPENSSL_NO_ECDSA | ||
154 | ENGINE_register_ECDSA(e); | ||
155 | #endif | ||
156 | ENGINE_register_RAND(e); | 136 | ENGINE_register_RAND(e); |
157 | return 1; | 137 | return 1; |
158 | } | 138 | } |