Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libtorrent/patches/rlibtorrent-07-openssl.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 27 Jul 2015 23:00:44 -0700
changeset 4702 79663d5c06d1
parent 4093 5b5a00e33545
permissions -rw-r--r--
Added tag s12-80 for changeset 252d4400c81a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4093
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Internal patch.
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# Remove dependency on whether or not OPENSSL_NO_DEPRECATED
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# is raised or not.
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
# Not for upstream. This version of libtorrent is much too old anyway.
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
--- libtorrent-0.12.2/src/utils/diffie_hellman.cc	2015-04-09 07:53:18.395899128 -0700
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
+++ libtorrent-0.12.2/src/utils/diffie_hellman.cc	2015-04-09 07:59:11.807442371 -0700
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
@@ -100,7 +100,7 @@
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
 			{
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
 			BN_init(&local_prk);
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
 			prk = &local_prk;
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
-			BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME);
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+			BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME);
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
 			}
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 		else
5b5a00e33545 20854786 librtorrent doesn't build on s12-71
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 			prk = priv_key;
upstream/oracle/userland-gate