summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_fat.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/engine/eng_fat.c')
-rw-r--r--src/lib/libcrypto/engine/eng_fat.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c
index c97695a7d3..baf1a54883 100644
--- a/src/lib/libcrypto/engine/eng_fat.c
+++ b/src/lib/libcrypto/engine/eng_fat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: eng_fat.c,v 1.16 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: eng_fat.c,v 1.17 2019/01/19 01:07:00 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -93,6 +93,10 @@ ENGINE_set_default(ENGINE *e, unsigned int flags)
93 if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e)) 93 if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
94 return 0; 94 return 0;
95#endif 95#endif
96#ifndef OPENSSL_NO_EC
97 if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e))
98 return 0;
99#endif
96 if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e)) 100 if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
97 return 0; 101 return 0;
98 if ((flags & ENGINE_METHOD_PKEY_METHS) && 102 if ((flags & ENGINE_METHOD_PKEY_METHS) &&
@@ -123,6 +127,8 @@ int_def_cb(const char *alg, int len, void *arg)
123 *pflags |= ENGINE_METHOD_ECDSA; 127 *pflags |= ENGINE_METHOD_ECDSA;
124 else if (!strncmp(alg, "DH", len)) 128 else if (!strncmp(alg, "DH", len))
125 *pflags |= ENGINE_METHOD_DH; 129 *pflags |= ENGINE_METHOD_DH;
130 else if (strncmp(alg, "EC", len) == 0)
131 *pflags |= ENGINE_METHOD_EC;
126 else if (!strncmp(alg, "RAND", len)) 132 else if (!strncmp(alg, "RAND", len))
127 *pflags |= ENGINE_METHOD_RAND; 133 *pflags |= ENGINE_METHOD_RAND;
128 else if (!strncmp(alg, "CIPHERS", len)) 134 else if (!strncmp(alg, "CIPHERS", len))
@@ -174,6 +180,9 @@ ENGINE_register_complete(ENGINE *e)
174#ifndef OPENSSL_NO_ECDSA 180#ifndef OPENSSL_NO_ECDSA
175 ENGINE_register_ECDSA(e); 181 ENGINE_register_ECDSA(e);
176#endif 182#endif
183#ifndef OPENSSL_NO_EC
184 ENGINE_register_EC(e);
185#endif
177 ENGINE_register_RAND(e); 186 ENGINE_register_RAND(e);
178 ENGINE_register_pkey_meths(e); 187 ENGINE_register_pkey_meths(e);
179 return 1; 188 return 1;