]>
Commit | Line | Data |
---|---|---|
f68ae02d AF |
1 | diff -Naur openssl-1.0.2a.org/crypto/engine/eng_all.c openssl-1.0.2a/crypto/engine/eng_all.c |
2 | --- openssl-1.0.2a.org/crypto/engine/eng_all.c 2015-03-19 14:30:36.000000000 +0100 | |
3 | +++ openssl-1.0.2a/crypto/engine/eng_all.c 2015-04-27 12:27:05.063569969 +0200 | |
4 | @@ -120,6 +120,14 @@ | |
5 | ENGINE_load_capi(); | |
6 | # endif | |
7 | #endif | |
8 | +#ifdef OPENSSL_NO_STATIC_ENGINE | |
9 | + ENGINE *e; | |
10 | + e = ENGINE_by_id("padlock"); | |
11 | + if (e != NULL) { | |
12 | + ENGINE_add(e); | |
13 | + ENGINE_free(e); | |
14 | + } | |
15 | +#endif | |
16 | ENGINE_register_all_complete(); | |
17 | } | |
18 | ||
19 | diff -Naur openssl-1.0.2a.org/ssl/ssl_algs.c openssl-1.0.2a/ssl/ssl_algs.c | |
20 | --- openssl-1.0.2a.org/ssl/ssl_algs.c 2015-03-19 14:30:36.000000000 +0100 | |
21 | +++ openssl-1.0.2a/ssl/ssl_algs.c 2015-04-27 11:04:27.893399695 +0200 | |
22 | @@ -151,5 +151,12 @@ | |
23 | #endif | |
24 | /* initialize cipher/digest methods table */ | |
25 | ssl_load_ciphers(); | |
26 | + | |
27 | + /* Init available hardware crypto engines */ | |
28 | + ENGINE_load_builtin_engines(); | |
29 | + ENGINE_register_all_complete(); | |
30 | + ENGINE * padlock = ENGINE_by_id("padlock"); | |
31 | + if (padlock) ENGINE_set_default_ciphers(padlock); | |
32 | + | |
33 | return (1); | |
34 | } |