projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
67cfe44
)
Remove ENGINE_load_dasync() (no OPENSSL_INIT_ENGINE_DASYNC already)
author
Azat Khuzhin
<a3at.mail@gmail.com>
Tue, 1 Nov 2016 14:35:35 +0000
(17:35 +0300)
committer
Matt Caswell
<matt@openssl.org>
Mon, 12 Dec 2016 17:37:36 +0000
(17:37 +0000)
Fixes:
8d00e30f96fb86b20bc992f626b188c3548fc58c
("Don't try to init
dasync internally")
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
CLA: trivial
(cherry picked from commit
b9b5181dd2f52ff0560a33b116396cdae5e48048
)
include/openssl/engine.h
patch
|
blob
|
history
diff --git
a/include/openssl/engine.h
b/include/openssl/engine.h
index 319371e42575fc7eecfc967742e1f041466684af..26cf714843dc86c782b1989cf59fff629ba721e6 100644
(file)
--- a/
include/openssl/engine.h
+++ b/
include/openssl/engine.h
@@
-334,8
+334,6
@@
ENGINE *ENGINE_by_id(const char *id);
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
# define ENGINE_load_capi() \
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
-# define ENGINE_load_dasync() \
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DASYNC, NULL)
# define ENGINE_load_afalg() \
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
# endif