1 This is in-house developed Solaris-specific patch and will not be submitted to upstream. |
|
2 |
|
3 --- tls1.6/tls.tcl Thu Mar 20 03:52:12 2008 |
|
4 +++ tls1.6/tls.tcl Mon Apr 21 16:36:08 2008 |
|
5 @@ -26,6 +26,9 @@ |
|
6 # Irrelevant to unixoids, but for Windows this enables the OS to find |
|
7 # the dependent DLL's in the CWD, where they may be. |
|
8 set cwd [pwd] |
|
9 + if {$::tcl_platform(wordSize) == 8} { |
|
10 + append dir "/64" |
|
11 + } |
|
12 catch {cd $dir} |
|
13 set res [catch {uplevel #0 [list load [file join [pwd] $dll]]} err] |
|
14 catch {cd $cwd} |
|
15 --- tls1.6/configure Wed Mar 19 15:37:51 2008 |
|
16 +++ tls1.6/configure Mon Jul 4 23:20:00 2011 |
|
17 @@ -8738,8 +8738,8 @@ |
|
18 echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} |
|
19 else |
|
20 do64bit_ok=yes |
|
21 - CFLAGS="$CFLAGS -xarch=amd64" |
|
22 - LDFLAGS="$LDFLAGS -xarch=amd64" |
|
23 + CFLAGS="$CFLAGS -m64" |
|
24 + LDFLAGS="$LDFLAGS -m64" |
|
25 fi |
|
26 else |
|
27 { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5 |
|
28 @@ -10126,7 +10126,12 @@ |
|
29 eval "LD_SEARCH_FLAGS=\"${LD_SEARCH_FLAGS}\"" |
|
30 if test -n "${OPENSSL}"; then |
|
31 |
|
32 - vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}" |
|
33 + if test "${with_ssl_dir+set}" = set; then |
|
34 + vars="${LD_SEARCH_FLAGS} -L${SSL_LIB_DIR} -lssl -lcrypto ${GCCPATH} ${GCCLIB}" |
|
35 + else |
|
36 + vars="${LD_SEARCH_FLAGS} -lssl -lcrypto ${GCCPATH} ${GCCLIB}" |
|
37 + fi |
|
38 + |
|
39 for i in $vars; do |
|
40 if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then |
|
41 # Convert foo.lib to -lfoo for GCC. No-op if not *.lib |
|
42 @@ -10170,6 +10175,11 @@ |
|
43 else |
|
44 TCLSH_PROG="${TCL_BIN_DIR}/tclsh" |
|
45 fi |
|
46 + if test "$do64bit_ok" = "yes" ; then |
|
47 + TCLSH_PROG="${TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}" |
|
48 + else |
|
49 + TCLSH_PROG="${TCL_BIN_DIR}/${TCLSH_PROG}" |
|
50 + fi |
|
51 else |
|
52 # tclConfig.sh is in install location |
|
53 if test "${TEA_PLATFORM}" = "windows"; then |
|
54 @@ -10186,7 +10196,11 @@ |
|
55 break |
|
56 fi |
|
57 done |
|
58 - TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}" |
|
59 + if test "$do64bit_ok" = "yes" ; then |
|
60 + TCLSH_PROG="${REAL_TCL_BIN_DIR}/${MACH64DIR}/${TCLSH_PROG}" |
|
61 + else |
|
62 + TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}" |
|
63 + fi |
|
64 fi |
|
65 echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5 |
|
66 echo "${ECHO_T}${TCLSH_PROG}" >&6 |
|
67 --- tls1.6/tls.c Wed Mar 19 16:06:13 2008 |
|
68 +++ tls1.6/tls.c Mon Jan 12 22:51:46 2015 |
|
69 @@ -676,17 +676,17 @@ |
|
70 #if defined(NO_SSL2) |
|
71 int ssl2 = 0; |
|
72 #else |
|
73 - int ssl2 = 1; |
|
74 + int ssl2 = 0; |
|
75 #endif |
|
76 #if defined(NO_SSL3) |
|
77 int ssl3 = 0; |
|
78 #else |
|
79 - int ssl3 = 1; |
|
80 + int ssl3 = 0; |
|
81 #endif |
|
82 #if defined(NO_SSL2) && defined(NO_SSL3) |
|
83 int tls1 = 1; |
|
84 #else |
|
85 - int tls1 = 0; |
|
86 + int tls1 = 1; |
|
87 #endif |
|
88 int proto = 0; |
|
89 int verify = 0, require = 0, request = 1; |
|