Skip to content

Commit 6b0327d

Browse files
Tor Didriksenbjornmu
authored andcommitted
Patch for Bug#17162055: SSL.CMAKE SILENTLY CHOOSES BUNDLED YASSL INSTEAD OF
ERRORING FOR OLD OPENSSL VER The problem was that if the user specified incorrect path to SSL installation, or if the user specified unsupported (too old) SSL installation using WITH_SSL, it's implicitly changed to the 'bundled' value, meaning bundled YaSSL will be used instead of user-specified SSL. The fix is to do not change WITH_SSL to the 'bundled' value, but rather exit with an error message and let the user to correct the WITH_SSL value. (cherry picked from commit c4fcbf13b6cd3f075490dc80bfd7546c5504c74f) Conflicts: cmake/ssl.cmake (cherry picked from commit e858eb9b5722520f3aaa445e284bba7b5882a249)
1 parent 5c84ca1 commit 6b0327d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cmake/ssl.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)