projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Opacity.
[openssl.git]
/
crypto
/
engine
/
eng_fat.c
diff --git
a/crypto/engine/eng_fat.c
b/crypto/engine/eng_fat.c
index bcb4c446b2a91f50402344e9049e694d28e5e42e..b331608a6eae947e37e91d25eaa299f8b4911439 100644
(file)
--- a/
crypto/engine/eng_fat.c
+++ b/
crypto/engine/eng_fat.c
@@
-1,4
+1,3
@@
-/* crypto/engine/eng_fat.c */
/* ====================================================================
* Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
*
/* ====================================================================
* Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
*
@@
-79,12
+78,8
@@
int ENGINE_set_default(ENGINE *e, unsigned int flags)
if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e))
return 0;
#endif
if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e))
return 0;
#endif
-#ifndef OPENSSL_NO_ECDH
- if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e))
- return 0;
-#endif
-#ifndef OPENSSL_NO_ECDSA
- if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))
+#ifndef OPENSSL_NO_EC
+ if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e))
return 0;
#endif
if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
return 0;
#endif
if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))
@@
-103,29
+98,29
@@
int ENGINE_set_default(ENGINE *e, unsigned int flags)
static int int_def_cb(const char *alg, int len, void *arg)
{
unsigned int *pflags = arg;
static int int_def_cb(const char *alg, int len, void *arg)
{
unsigned int *pflags = arg;
- if (!strncmp(alg, "ALL", len))
+ if (alg == NULL)
+ return 0;
+ if (strncmp(alg, "ALL", len) == 0)
*pflags |= ENGINE_METHOD_ALL;
*pflags |= ENGINE_METHOD_ALL;
- else if (
!strncmp(alg, "RSA", len)
)
+ else if (
strncmp(alg, "RSA", len) == 0
)
*pflags |= ENGINE_METHOD_RSA;
*pflags |= ENGINE_METHOD_RSA;
- else if (
!strncmp(alg, "DSA", len)
)
+ else if (
strncmp(alg, "DSA", len) == 0
)
*pflags |= ENGINE_METHOD_DSA;
*pflags |= ENGINE_METHOD_DSA;
- else if (!strncmp(alg, "ECDH", len))
- *pflags |= ENGINE_METHOD_ECDH;
- else if (!strncmp(alg, "ECDSA", len))
- *pflags |= ENGINE_METHOD_ECDSA;
- else if (!strncmp(alg, "DH", len))
+ else if (strncmp(alg, "DH", len) == 0)
*pflags |= ENGINE_METHOD_DH;
*pflags |= ENGINE_METHOD_DH;
- else if (!strncmp(alg, "RAND", len))
+ else if (strncmp(alg, "EC", len) == 0)
+ *pflags |= ENGINE_METHOD_EC;
+ else if (strncmp(alg, "RAND", len) == 0)
*pflags |= ENGINE_METHOD_RAND;
*pflags |= ENGINE_METHOD_RAND;
- else if (
!strncmp(alg, "CIPHERS", len)
)
+ else if (
strncmp(alg, "CIPHERS", len) == 0
)
*pflags |= ENGINE_METHOD_CIPHERS;
*pflags |= ENGINE_METHOD_CIPHERS;
- else if (
!strncmp(alg, "DIGESTS", len)
)
+ else if (
strncmp(alg, "DIGESTS", len) == 0
)
*pflags |= ENGINE_METHOD_DIGESTS;
*pflags |= ENGINE_METHOD_DIGESTS;
- else if (
!strncmp(alg, "PKEY", len)
)
+ else if (
strncmp(alg, "PKEY", len) == 0
)
*pflags |= ENGINE_METHOD_PKEY_METHS | ENGINE_METHOD_PKEY_ASN1_METHS;
*pflags |= ENGINE_METHOD_PKEY_METHS | ENGINE_METHOD_PKEY_ASN1_METHS;
- else if (
!strncmp(alg, "PKEY_CRYPTO", len)
)
+ else if (
strncmp(alg, "PKEY_CRYPTO", len) == 0
)
*pflags |= ENGINE_METHOD_PKEY_METHS;
*pflags |= ENGINE_METHOD_PKEY_METHS;
- else if (
!strncmp(alg, "PKEY_ASN1", len)
)
+ else if (
strncmp(alg, "PKEY_ASN1", len) == 0
)
*pflags |= ENGINE_METHOD_PKEY_ASN1_METHS;
else
return 0;
*pflags |= ENGINE_METHOD_PKEY_ASN1_METHS;
else
return 0;
@@
-157,11
+152,8
@@
int ENGINE_register_complete(ENGINE *e)
#ifndef OPENSSL_NO_DH
ENGINE_register_DH(e);
#endif
#ifndef OPENSSL_NO_DH
ENGINE_register_DH(e);
#endif
-#ifndef OPENSSL_NO_ECDH
- ENGINE_register_ECDH(e);
-#endif
-#ifndef OPENSSL_NO_ECDSA
- ENGINE_register_ECDSA(e);
+#ifndef OPENSSL_NO_EC
+ ENGINE_register_EC(e);
#endif
ENGINE_register_RAND(e);
ENGINE_register_pkey_meths(e);
#endif
ENGINE_register_RAND(e);
ENGINE_register_pkey_meths(e);