/[pkg-src]/trunk/qt4/patches/qt-4.8.7-disable-sslv3.patch

Diff of /trunk/qt4/patches/qt-4.8.7-disable-sslv3.patch

Parent Directory | Revision Log | View Patch Patch

-revision 2916 by niro,
Thu Apr 27 14:31:29 2017 UTC
+revision 2917 by niro,
Wed May 17 09:04:25 2017 UTC
 Line 1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ diff -u -r qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp	2015-05-07 16:14:44.000000000 +0200
- <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+ +++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp	2016-03-04 11:29:17.119300898 +0100
- <head>
+ @@ -267,7 +267,11 @@
- <title>svntogit/packages.git - Git clone of the 'packages' repository
- </title>
- <meta name='generator' content='cgit v0.12'/>
- <meta name='robots' content='index, nofollow'/>
- <link rel='stylesheet' type='text/css' href='/cgit.css'/>
- <link rel='shortcut icon' href='/favicon.ico'/>
- <link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/disable-sslv3.patch?h=packages/qt4' type='application/atom+xml'/>
- <link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
- <link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
- <link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
- </head>
- <body>
- 	<div id="archnavbar"><!-- Arch Linux global navigation bar -->
- 		<div id="archnavbarlogo">
- 			<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>
- 		</div>
- 		<div id="archnavbarmenu">
- 			<ul id="archnavbarlist">
- 				<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
- 				<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
- 				<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
- 				<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
- 				<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>
- 				<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
- 				<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
- 			</ul>
- 		</div>
- 	</div><!-- #archnavbar -->
- <div id='cgit'><table id='header'>
- <tr>
- <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>
- <tr><td class='sub'>Git clone of the 'packages' repository
- </td><td class='sub right'></td></tr></table>
- <table class='tabs'><tr><td>
- <a href='/svntogit/packages.git/?h=packages/qt4'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/qt4'>refs</a><a href='/svntogit/packages.git/log/trunk/disable-sslv3.patch?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/disable-sslv3.patch?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/disable-sslv3.patch?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/disable-sslv3.patch?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/disable-sslv3.patch?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/disable-sslv3.patch'>
- <input type='hidden' name='h' value='packages/qt4'/><select name='qt'>
- <option value='grep'>log msg</option>
- <option value='author'>author</option>
- <option value='committer'>committer</option>
- <option value='range'>range</option>
- </select>
- <input class='txt' type='text' size='10' name='q' value=''/>
- <input type='submit' value='search'/>
- </form>
- </td></tr></table>
- <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/qt4'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/qt4'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/disable-sslv3.patch?h=packages/qt4'>disable-sslv3.patch</a></div><div class='content'>blob: 5ebd97417250f3e0105e7a048e7dc2beec158289 (<a href='/svntogit/packages.git/plain/trunk/disable-sslv3.patch?h=packages/qt4'>plain</a>)
- <table summary='blob content' class='blob'>
- <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
- <a id='n2' href='#n2'>2</a>
- <a id='n3' href='#n3'>3</a>
- <a id='n4' href='#n4'>4</a>
- <a id='n5' href='#n5'>5</a>
- <a id='n6' href='#n6'>6</a>
- <a id='n7' href='#n7'>7</a>
- <a id='n8' href='#n8'>8</a>
- <a id='n9' href='#n9'>9</a>
- <a id='n10' href='#n10'>10</a>
- <a id='n11' href='#n11'>11</a>
- <a id='n12' href='#n12'>12</a>
- <a id='n13' href='#n13'>13</a>
- <a id='n14' href='#n14'>14</a>
- <a id='n15' href='#n15'>15</a>
- <a id='n16' href='#n16'>16</a>
- <a id='n17' href='#n17'>17</a>
- <a id='n18' href='#n18'>18</a>
- <a id='n19' href='#n19'>19</a>
- <a id='n20' href='#n20'>20</a>
- <a id='n21' href='#n21'>21</a>
- <a id='n22' href='#n22'>22</a>
- <a id='n23' href='#n23'>23</a>
- <a id='n24' href='#n24'>24</a>
- <a id='n25' href='#n25'>25</a>
- <a id='n26' href='#n26'>26</a>
- <a id='n27' href='#n27'>27</a>
- <a id='n28' href='#n28'>28</a>
- <a id='n29' href='#n29'>29</a>
- <a id='n30' href='#n30'>30</a>
- <a id='n31' href='#n31'>31</a>
- <a id='n32' href='#n32'>32</a>
- <a id='n33' href='#n33'>33</a>
- <a id='n34' href='#n34'>34</a>
- <a id='n35' href='#n35'>35</a>
- <a id='n36' href='#n36'>36</a>
- <a id='n37' href='#n37'>37</a>
- <a id='n38' href='#n38'>38</a>
- <a id='n39' href='#n39'>39</a>
- <a id='n40' href='#n40'>40</a>
- <a id='n41' href='#n41'>41</a>
- <a id='n42' href='#n42'>42</a>
- <a id='n43' href='#n43'>43</a>
- <a id='n44' href='#n44'>44</a>
- <a id='n45' href='#n45'>45</a>
- <a id='n46' href='#n46'>46</a>
- <a id='n47' href='#n47'>47</a>
- <a id='n48' href='#n48'>48</a>
- <a id='n49' href='#n49'>49</a>
- <a id='n50' href='#n50'>50</a>
- <a id='n51' href='#n51'>51</a>
- <a id='n52' href='#n52'>52</a>
- <a id='n53' href='#n53'>53</a>
- <a id='n54' href='#n54'>54</a>
- </pre></td>
- <td class='lines'><pre><code>diff -u -r qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp
- <span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp	2015-05-07 16:14:44.000000000 +0200</span>
- <span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp	2016-03-04 11:29:17.119300898 +0100</span>
- <span class="hl kwd">&#64;&#64; -267,7 +267,11 &#64;&#64;</span>
   #endif
           break;
       case QSsl::SslV3:
- <span class="hl kwa">+#ifndef OPENSSL_NO_SSL3</span>
+ +#ifndef OPENSSL_NO_SSL3
           ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
- <span class="hl kwa">+#else</span>
+ +#else
- <span class="hl kwa">+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -&gt; error</span>
+ +        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
- <span class="hl kwa">+#endif</span>
+ +#endif
           break;
       case QSsl::SecureProtocols: // SslV2 will be disabled below
       case QSsl::TlsV1SslV3: // SslV2 will be disabled below
  diff -u -r qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp
- <span class="hl kwb">--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-05-07 16:14:44.000000000 +0200</span>
+ --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-05-07 16:14:44.000000000 +0200
- <span class="hl kwa">+++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp	2016-03-04 11:28:52.806050135 +0100</span>
+ +++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp	2016-03-04 11:28:52.806050135 +0100
- <span class="hl kwd">&#64;&#64; -228,13 +228,17 &#64;&#64;</span>
+ @@ -228,13 +228,17 @@
   #ifndef OPENSSL_NO_SSL2
   DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
   #endif
- <span class="hl kwa">+#ifndef OPENSSL_NO_SSL3</span>
+ +#ifndef OPENSSL_NO_SSL3
   DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
- <span class="hl kwa">+#endif</span>
+ +#endif
   DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
   DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
   #ifndef OPENSSL_NO_SSL2
   DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
   #endif
- <span class="hl kwa">+#ifndef OPENSSL_NO_SSL3</span>
+ +#ifndef OPENSSL_NO_SSL3
   DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
- <span class="hl kwa">+#endif</span>
+ +#endif
   DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
   DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
   #else
- <span class="hl kwd">&#64;&#64; -822,13 +826,17 &#64;&#64;</span>
+ @@ -822,13 +826,17 @@
   #ifndef OPENSSL_NO_SSL2
       RESOLVEFUNC(SSLv2_client_method)
   #endif
- <span class="hl kwa">+#ifndef OPENSSL_NO_SSL3</span>
+ +#ifndef OPENSSL_NO_SSL3
       RESOLVEFUNC(SSLv3_client_method)
- <span class="hl kwa">+#endif</span>
+ +#endif
       RESOLVEFUNC(SSLv23_client_method)
       RESOLVEFUNC(TLSv1_client_method)
   #ifndef OPENSSL_NO_SSL2
       RESOLVEFUNC(SSLv2_server_method)
   #endif
- <span class="hl kwa">+#ifndef OPENSSL_NO_SSL3</span>
+ +#ifndef OPENSSL_NO_SSL3
       RESOLVEFUNC(SSLv3_server_method)
- <span class="hl kwa">+#endif</span>
+ +#endif
       RESOLVEFUNC(SSLv23_server_method)
       RESOLVEFUNC(TLSv1_server_method)
       RESOLVEFUNC(X509_NAME_entry_count)
- </code></pre></td></tr></table>
- </div> <!-- class=content -->
- <div class="foot" style="padding-left:1em;padding-right:1em;">
- <p>Copyright &copy; 2002-2016 <a href="mailto:jvinet@zeroflux.org"
- title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
- title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
- are recognized trademarks. Some rights reserved. The registered trademark
- Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee
- of Linus Torvalds, owner of the mark on a world-wide basis.</p>
- </div>
- </div> <!-- id=cgit -->
- </body>
- </html>

 Legend:



Removed from v.2916
 


changed lines


 
Added in v.2917
 Legend:



Removed from v.2916
 


changed lines


 
Added in v.2917
-Removed from v.2916
+Added in v.2917