--- a/dcpp/CryptoManager.cpp.orig	2011-04-17 17:57:09 UTC
+++ b/dcpp/CryptoManager.cpp
@@ -107,12 +107,20 @@ CryptoManager::CryptoManager()
                 };
 
 		if(dh) {
-			dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0);
-			dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0);
+			BIGNUM *p, *g;
 
-			if (!dh->p || !dh->g) {
+			p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0);
+			g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0);
+
+			if (!p || !g) {
 				dh.reset();
 			} else {
+#if OPENSSL_VERSION_NUMBER < 0x10100005L
+				dh->p = p;
+				dh->g = g;
+#else
+				DH_set0_pqg(dh, p, NULL, g);
+#endif
 				SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE);
 				SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE);
 				SSL_CTX_set_tmp_dh(serverContext, (DH*)dh);
n>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>refs</a><a class='active' href='/guix/log/tests/build-utils.scm'>log</a><a href='/guix/tree/tests/build-utils.scm?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>tree</a><a href='/guix/commit/tests/build-utils.scm?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>commit</a><a href='/guix/diff/tests/build-utils.scm?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/build-utils.scm'>
<input type='hidden' name='id' value='0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'/><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='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>root</a>/<a href='/guix/log/tests?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>tests</a>/<a href='/guix/log/tests/build-utils.scm?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd'>build-utils.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/build-utils.scm?id=0836ef6b69a1fb4d26ad3b33bb1d4e32a6f872bd&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-11-16 11:21:42 +0100'>2020-11-16</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=977eb5d023cfdf8e336f1896480eea9cef5c04e9'>Properly deal with build directories containing '~'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/44626&gt;.
Reported by Vagrant Cascadian &lt;vagrant@debian.org&gt;.

* tests/build-utils.scm ("wrap-script, simple case"): Pass
SCRIPT-CONTENTS to 'display' rather than 'format'.
* gnu/services/base.scm (file-system-&gt;shepherd-service-name)
[valid-characters, mount-point]: New variables.
Filter out invalid store file name characters from the mount point of
FILE-SYSTEM.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-11-26 00:16:35 +0100'>2019-11-26</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=f5698dfb87df1132ca5c73a8ed7f75f63c07669f'>tests: Avoid unnecessary use of 'mock'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/build-utils.scm ("wrap-script, simple case"): Use the real
'which' instead of mocking it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-11-26 00:16:35 +0100'>2019-11-26</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=1d64afbdc0644a2be8bd2ad157085731e212ab74'>tests: Avoid (catch 'srfi-34 …) form.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/build-utils.scm ("wrap-script, raises condition"): Use 'guard'
instead of "catch 'srfi-34".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-17 16:13:36 +0200'>2019-06-17</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=45d46223f92b0933aaf9b1392a21d09eaa1e2881'>utils: Add 'invoke/quiet'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/bootloader.scm (G_): Remove.
(open-pipe-with-stderr, invoke/quiet): Move to...
* guix/build/utils.scm: ... here.  Use 'let-values' instead of
'define-values' because Guile 2.0 (the bootstrap Guile) doesn't know
about 'define-values'.
* po/guix/POTFILES.in: Remove gnu/build/bootloader.scm, and add
guix/build/utils.scm.
* tests/build-utils.scm: Remove import of (gnu build bootloader).
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-23 23:16:55 +0100'>2019-03-23</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=8c14f7f8a7ab0722bf4c9f92fd28ae85514d564f'>Merge branch 'staging' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-03-16 18:15:13 +0100'>2019-03-16</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=f0cc5e7e1e4c03af29c5d4855dc5962502c49147'>booloader: Add 'invoke/quiet'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/bootloader.scm (G_): New macro.
(open-pipe-with-stderr, invoke/quiet): New procedures.
* tests/build-utils.scm ("invoke/quiet, success")
("invoke/quiet, failure")
("invoke/quiet, failure, message on stderr"): New tests.
* po/guix/POTFILES.in: Add bootloader.scm.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-16 18:15:09 +0100'>2019-03-16</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=22f95e028f038cee342f455dfc55bd32b804907c'>tests: Add 'with-environment-variable'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/scripts.scm (with-environment-variable): Move to...
* guix/tests.scm (with-environment-variable): ... here.
* tests/build-utils.scm ("wrap-program, one input, multiple calls"):
Use it instead of 'setenv'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-08 10:26:53 +0100'>2019-02-08</span></td><td><a href='/guix/commit/tests/build-utils.scm?id=0fb9a8df429a7b9f40610ff15baaff0d8e31e8cf'>guix: Add wrap-script.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/build/utils.scm (wrap-script): New procedure.
(&amp;wrap-error): New condition.
(wrap-error?, wrap-error-program, wrap-error-type): New procedures.
* tests/build-utils.scm ("wrap-script, simple case", "wrap-script, with
encoding declaration", "wrap-script, raises condition"): New tests.
</span></span></td><td>Ricardo Wurmus</td></tr>