]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/squid/squid-3.5-14175.patch
core114: Ship updated gnutls
[ipfire-2.x.git] / src / patches / squid / squid-3.5-14175.patch
1 ------------------------------------------------------------
2 revno: 14175
3 revision-id: squid3@treenet.co.nz-20170629125627-socq6szqysvm9ifa
4 parent: squid3@treenet.co.nz-20170622153146-nxo8vl6a9r8z03v4
5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4112
6 author: Sven Eisenberg <sven.eisenberg@lairdtech.com>
7 committer: Amos Jeffries <squid3@treenet.co.nz>
8 branch nick: 3.5
9 timestamp: Fri 2017-06-30 00:56:27 +1200
10 message:
11 Bug 4112: ssl_engine does not accept cryptodev
12 ------------------------------------------------------------
13 # Bazaar merge directive format 2 (Bazaar 0.90)
14 # revision_id: squid3@treenet.co.nz-20170629125627-socq6szqysvm9ifa
15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
16 # testament_sha1: c74e6941e5b6df8e36d26dd5c02389ae2955bc21
17 # timestamp: 2017-06-29 13:51:04 +0000
18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
19 # base_revision_id: squid3@treenet.co.nz-20170622153146-\
20 # nxo8vl6a9r8z03v4
21 #
22 # Begin patch
23 === modified file 'src/ssl/support.cc'
24 --- src/ssl/support.cc 2017-01-27 16:14:19 +0000
25 +++ src/ssl/support.cc 2017-06-29 12:56:27 +0000
26 @@ -737,6 +737,7 @@
27
28 #if HAVE_OPENSSL_ENGINE_H
29 if (Config.SSL.ssl_engine) {
30 + ENGINE_load_builtin_engines();
31 ENGINE *e;
32 if (!(e = ENGINE_by_id(Config.SSL.ssl_engine)))
33 fatalf("Unable to find SSL engine '%s'\n", Config.SSL.ssl_engine);
34