From 2f10ab987cae28ebbfe8cf1e3aa2bd185cba658d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 30 Apr 2019 09:05:55 +0300 Subject: [PATCH] =?UTF-8?q?app-arch/dump:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BF=D0=B0=D1=82=D1=87=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20=D1=81=20openss?= =?UTF-8?q?l-1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app-arch/.calculate_directory | 1 + .../app-arch/dump/.calculate_directory | 1 + .../dump/dump-0.4.46-openssl-1.1.patch | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_install_patch/app-arch/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/app-arch/dump/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/app-arch/dump/dump-0.4.46-openssl-1.1.patch diff --git a/profiles/templates/3.6/6_ac_install_patch/app-arch/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/app-arch/.calculate_directory new file mode 100644 index 000000000..720d52e47 --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/app-arch/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/app-arch/dump/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/app-arch/dump/.calculate_directory new file mode 100644 index 000000000..615bc8bdf --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/app-arch/dump/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip merge()!= diff --git a/profiles/templates/3.6/6_ac_install_patch/app-arch/dump/dump-0.4.46-openssl-1.1.patch b/profiles/templates/3.6/6_ac_install_patch/app-arch/dump/dump-0.4.46-openssl-1.1.patch new file mode 100644 index 000000000..5b8069647 --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/app-arch/dump/dump-0.4.46-openssl-1.1.patch @@ -0,0 +1,22 @@ +# Calculate format=diff merge(app-arch/dump)==0.4.46&&pkg(dev-libs/openssl)>=1.1 +diff -Naur dump-0.4b46/common/transformation_ssl.c dump-0.4b46-new/common/transformation_ssl.c +--- dump-0.4b46/common/transformation_ssl.c 2016-06-08 07:01:45.000000000 +0200 ++++ dump-0.4b46-new/common/transformation_ssl.c 2019-01-02 11:26:15.945017945 +0100 +@@ -215,7 +215,7 @@ + /* to be exposed to any attacker anyway. */ + *saltlen = 16; + if (xform->enc == 1) { +- RAND_pseudo_bytes(salt, *saltlen); ++ RAND_bytes(salt, *saltlen); + } + memcpy(ivbuffer, salt, 16); + +@@ -515,7 +515,7 @@ + //EVP_CIPHER_CTX_rand_key(ctx, t->state.ssl.key); + //EVP_CIPHER_CTX_cleanup(ctx); + //EVP_CIPHER_CTX_free(ctx); +- RAND_bytes(t->state.ssl.key, t->state.ssl.cipher->key_len); ++ RAND_bytes(t->state.ssl.key, EVP_CIPHER_key_length(t->state.ssl.cipher)); + } else { + // how do we get keys? + }