| author | Danek Duvall <danek.duvall@oracle.com> |
| Fri, 03 Oct 2014 15:13:30 -0700 | |
| branch | s11u2-sru |
| changeset 3382 | b7084b0e8a61 |
| parent 2633 | 19ab7c71aa1a |
| permissions | -rw-r--r-- |
|
2633
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
Author: joe |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
Date: Fri Jul 6 21:23:20 2012 |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
New Revision: 1895 |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
Modified: |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
neon/trunk/src/ne_socket.c |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
Log: |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
* src/ne_socket.c (ne_sock_connect_ssl): Drop OpenSSL version check, |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
inappropriate with OpenSSL 1.x; patch by Mike Frysinger. |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
Modified: neon/trunk/src/ne_socket.c |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
============================================================================== |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
--- src/ne_socket.c (original) |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
+++ src/ne_socket.c Fri Jul 6 21:23:20 2012 |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
@@ -1718,13 +1718,6 @@ |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
return NE_SOCK_ERROR; |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
} |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
- /* If runtime library version differs from compile-time version |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
- * number in major/minor/fix level, abort soon. */ |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
- if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & 0xFFFFF000) {
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
- set_error(sock, _("SSL disabled due to library version mismatch"));
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
- return NE_SOCK_ERROR; |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
- } |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
- |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
sock->ssl = ssl = SSL_new(ctx->ctx); |
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
if (!ssl) {
|
|
19ab7c71aa1a
16457346 libneon fails in build 16 due to openssl mismatch
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
set_error(sock, _("Could not create SSL structure"));
|