Gwyn Ciesla
7 years ago
parent
cd457e5eac
commit
509226bd61
@ -0,0 +1,124 @@
|
||||
From 1108498d2a1a9c47931f41b04f248616b29383d6 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
||||
Date: Mon, 5 Sep 2016 21:49:07 +0000
|
||||
Subject: [PATCH] transmission: build against openssl 1.1.0
|
||||
|
||||
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
||||
---
|
||||
libtransmission/crypto-utils-openssl.c | 73 ++++++++++++++++++++++++++++++++--
|
||||
1 file changed, 69 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
|
||||
index 77a628bea..16a37b205 100644
|
||||
--- a/libtransmission/crypto-utils-openssl.c
|
||||
+++ b/libtransmission/crypto-utils-openssl.c
|
||||
@@ -230,6 +230,61 @@ tr_rc4_process (tr_rc4_ctx_t handle,
|
||||
****
|
||||
***/
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
+static inline int
|
||||
+DH_set0_pqg (DH * dh,
|
||||
+ BIGNUM * p,
|
||||
+ BIGNUM * q,
|
||||
+ BIGNUM * g)
|
||||
+{
|
||||
+ /* If the fields p and g in d are NULL, the corresponding input
|
||||
+ * parameters MUST be non-NULL. q may remain NULL.
|
||||
+ */
|
||||
+ if ((dh->p == NULL && p == NULL)
|
||||
+ || (dh->g == NULL && g == NULL))
|
||||
+ return 0;
|
||||
+
|
||||
+ if (p != NULL) {
|
||||
+ BN_free (dh->p);
|
||||
+ dh->p = p;
|
||||
+ }
|
||||
+ if (q != NULL) {
|
||||
+ BN_free (dh->q);
|
||||
+ dh->q = q;
|
||||
+ }
|
||||
+ if (g != NULL) {
|
||||
+ BN_free (dh->g);
|
||||
+ dh->g = g;
|
||||
+ }
|
||||
+
|
||||
+ if (q != NULL) {
|
||||
+ dh->length = BN_num_bits (q);
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+DH_set_length (DH * dh,
|
||||
+ long length)
|
||||
+{
|
||||
+ dh->length = length;
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static inline void
|
||||
+DH_get0_key(const DH * dh,
|
||||
+ const BIGNUM ** pub_key,
|
||||
+ const BIGNUM ** priv_key)
|
||||
+{
|
||||
+ if (pub_key != NULL)
|
||||
+ *pub_key = dh->pub_key;
|
||||
+ if (priv_key != NULL)
|
||||
+ *priv_key = dh->priv_key;
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
tr_dh_ctx_t
|
||||
tr_dh_new (const uint8_t * prime_num,
|
||||
size_t prime_num_length,
|
||||
@@ -237,13 +292,19 @@ tr_dh_new (const uint8_t * prime_num,
|
||||
size_t generator_num_length)
|
||||
{
|
||||
DH * handle = DH_new ();
|
||||
+ BIGNUM * p, * g;
|
||||
|
||||
assert (prime_num != NULL);
|
||||
assert (generator_num != NULL);
|
||||
+ p = BN_bin2bn (prime_num, prime_num_length, NULL);
|
||||
+ g = BN_bin2bn (generator_num, generator_num_length, NULL);
|
||||
|
||||
- if (!check_pointer (handle->p = BN_bin2bn (prime_num, prime_num_length, NULL)) ||
|
||||
- !check_pointer (handle->g = BN_bin2bn (generator_num, generator_num_length, NULL)))
|
||||
+ if (!check_pointer (p) ||
|
||||
+ !check_pointer (g) ||
|
||||
+ !DH_set0_pqg (handle, p, NULL, g))
|
||||
{
|
||||
+ BN_free (p);
|
||||
+ BN_free (g);
|
||||
DH_free (handle);
|
||||
handle = NULL;
|
||||
}
|
||||
@@ -268,16 +329,20 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
|
||||
{
|
||||
DH * handle = raw_handle;
|
||||
int dh_size, my_public_key_length;
|
||||
+ const BIGNUM * hand_pub_key;
|
||||
|
||||
assert (handle != NULL);
|
||||
assert (public_key != NULL);
|
||||
|
||||
- handle->length = private_key_length * 8;
|
||||
+
|
||||
+ DH_set_length(handle, private_key_length * 8);
|
||||
|
||||
if (!check_result (DH_generate_key (handle)))
|
||||
return false;
|
||||
|
||||
- my_public_key_length = BN_bn2bin (handle->pub_key, public_key);
|
||||
+ DH_get0_key (handle, &hand_pub_key, NULL);
|
||||
+
|
||||
+ my_public_key_length = BN_bn2bin (hand_pub_key, public_key);
|
||||
dh_size = DH_size (handle);
|
||||
|
||||
tr_dh_align_key (public_key, my_public_key_length, dh_size);
|
||||
--
|
||||
2.14.3
|
||||
|
||||
Loading…
Reference in new issue