diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-23 06:44:33 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-23 06:44:33 +0000 |
commit | dd5b71d2ad69f1887985ee1ca67b254e04157f73 (patch) | |
tree | e799be54f9ea7c4949c6a49c1a6f9667a7e1fef2 /net-libs/libvncserver/files | |
parent | be14af2d51852951dbfea41913a7dd9d1190151e (diff) |
gentoo auto-resync : 23:03:2023 - 06:44:33
Diffstat (limited to 'net-libs/libvncserver/files')
-rw-r--r-- | net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch b/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch new file mode 100644 index 000000000000..85179ee5ae61 --- /dev/null +++ b/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch @@ -0,0 +1,56 @@ +https://github.com/LibVNC/libvncserver/commit/b686f379c34114cf938fe88291f58014337558f6 +https://bugs.gentoo.org/893608 + +From b686f379c34114cf938fe88291f58014337558f6 Mon Sep 17 00:00:00 2001 +From: Gaurav Ujjwal <gujjwal00@gmail.com> +Date: Mon, 23 Jan 2023 00:03:03 +0530 +Subject: [PATCH] common/crypto_openssl: pad DH key buffers with leading zeros + for smaller keys + +Re: https://github.com/LibVNC/libvncserver/issues/493 +Re: https://github.com/bk138/multivnc/issues/202 +--- a/common/crypto_openssl.c ++++ b/common/crypto_openssl.c +@@ -156,6 +156,15 @@ int encrypt_aes128ecb(void *out, int *out_len, const unsigned char key[16], cons + return result; + } + ++static void pad_leading_zeros(uint8_t *out, const size_t current_len, const size_t expected_len) { ++ if (current_len >= expected_len || expected_len < 1) ++ return; ++ ++ size_t diff = expected_len - current_len; ++ memmove(out + diff, out, current_len); ++ memset(out, 0, diff); ++} ++ + int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, const size_t gen_len, const uint8_t *prime, const size_t keylen) + { + int result = 0; +@@ -184,6 +193,9 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, + goto out; + if(BN_bn2bin(dh->pub_key, pub_out) == 0) + goto out; ++ ++ pad_leading_zeros(priv_out, BN_num_bytes(dh->priv_key), keylen); ++ pad_leading_zeros(pub_out, BN_num_bytes(dh->pub_key), keylen); + #else + DH_get0_key(dh, &pub_key, &priv_key); + if(BN_bn2binpad(priv_key, priv_out, keylen) == -1) +@@ -216,9 +228,11 @@ int dh_compute_shared_key(uint8_t *shared_out, const uint8_t *priv, const uint8_ + if(!DH_set0_key(dh, NULL, BN_bin2bn(priv, keylen, NULL))) + goto out; + #endif +- if(DH_compute_key(shared_out, BN_bin2bn(pub, keylen, NULL), dh) == -1) +- goto out; ++ int shared_len = DH_compute_key(shared_out, BN_bin2bn(pub, keylen, NULL), dh); ++ if(shared_len == -1) ++ goto out; + ++ pad_leading_zeros(shared_out, shared_len, keylen); + result = 1; + + out: +-- +2.39.2 + |