Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a4a90f84d2463cf6d674be9c70d1abe513682c53)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a4a90f84d2463cf6d674be9c70d1abe513682c53)
  • Date: Tue, 19 Apr 2022 11:18:28 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/vpnc/DETAILS | 2 -
net/vpnc/HISTORY | 4 ++
net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch | 22
+++++++++------
3 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit a4a90f84d2463cf6d674be9c70d1abe513682c53
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vpnc: Patch update, SECURITY_PATCH++

diff --git a/net/vpnc/DETAILS b/net/vpnc/DETAILS
index dae56d9..841e038 100755
--- a/net/vpnc/DETAILS
+++ b/net/vpnc/DETAILS
@@ -1,6 +1,6 @@
SPELL=vpnc
VERSION=0.5.3
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.unix-ag.uni-kl.de/%7Emassar/vpnc/$SOURCE
diff --git a/net/vpnc/HISTORY b/net/vpnc/HISTORY
index 9244ba2..59d1029 100644
--- a/net/vpnc/HISTORY
+++ b/net/vpnc/HISTORY
@@ -1,3 +1,7 @@
+2022-04-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, patches/0002-Fix-cleanup-of-shared-secret.patch: updated
patch
+ SECURITY_PATCH++
+
2022-04-18 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: removed edit of Makefile, not needed
added apply_patch_dir
diff --git a/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
b/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
index 4a8f6fa..e656e8d 100644
--- a/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
+++ b/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
@@ -1,15 +1,15 @@
-From aa688f2b9ccd3e229f2a059a3d57408cdc0cf92b Mon Sep 17 00:00:00 2001
+From 0c9a06b9555bf48b07f5d69ec78ac835510676cf Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael AT iodev.co.uk>
Date: Mon, 18 Apr 2022 19:04:44 +0200
Subject: [PATCH 2/4] Fix cleanup of shared secret

Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
---
- vpnc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ vpnc.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/vpnc.c b/vpnc.c
-index 39eb40e86fa5..e5924161ef83 100644
+index 39eb40e86fa5..8bb52f95a96f 100644
--- a/vpnc.c
+++ b/vpnc.c
@@ -1899,7 +1899,7 @@ static void do_phase1_am(const char *key_id, const
char *shared_key, struct sa_b
@@ -29,14 +29,20 @@ index 39eb40e86fa5..e5924161ef83 100644
free(dh_shared_secret);
free(psk_hash);
group_free(dh_grp);
-@@ -2858,6 +2859,7 @@ static void do_phase2_qm(struct sa_block *s)
+@@ -2856,9 +2857,11 @@ static void do_phase2_qm(struct sa_block *s)
+ dh_shared_secret, dh_grp ? dh_getlen(dh_grp) : 0,
+ nonce_i, sizeof(nonce_i), nonce_r->u.nonce.data,
nonce_r->u.nonce.length);

- if (dh_grp)
+- if (dh_grp)
++ if (dh_grp) {
++ memset(dh_shared_secret, 0, dh_getlen(dh_grp));
++ free(dh_shared_secret);
group_free(dh_grp);
-+ memset(dh_shared_secret, 0, dh_getlen(dh_grp));
- free(dh_shared_secret);
+- free(dh_shared_secret);
++ }
free_isakmp_packet(r);

+ if ((opt_natt_mode == NATT_CISCO_UDP) &&
s->ipsec.peer_udpencap_port) {
--
2.35.3




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a4a90f84d2463cf6d674be9c70d1abe513682c53), Ismael Luceno, 04/19/2022

Archive powered by MHonArc 2.6.24.

Top of Page