cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect loop condition in egg_hkdf_perform(), from upstream.

Browse Source
This commit is contained in:
ajacoutot 2012-10-24 07:04:03 +00:00
parent 5267e3335c
commit 0e0967b7a1
8 changed files with 118 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/gcr/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2012/10/16 06:46:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2012/10/24 07:04:03 ajacoutot Exp $
COMMENT= library for bits of crypto UI and parsing
GNOME_PROJECT= gcr
GNOME_VERSION= 3.6.1
REVISION= 0
SHARED_LIBS += gck-1 1.0 # 0.0
SHARED_LIBS += gcr-3 2.0 # 1.0
@ -44,7 +45,7 @@ RUN_DEPENDS= misc/shared-mime-info
LIB_DEPENDS= x11/gtk+3 \
security/libgcrypt \
security/p11-kit>=0.14
security/p11-kit
CONFIGURE_ARGS= --disable-update-mime

27
x11/gnome/gcr/patches/patch-egg_egg-hkdf_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-egg_egg-hkdf_c,v 1.1 2012/10/24 07:04:03 ajacoutot Exp $
From ce0f9c79382830a50d19f0d66d1997476950074a Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 22 Oct 2012 20:09:46 +0000
Subject: Fix incorrect loop condition in egg_hkdf_perform()
--- egg/egg-hkdf.c.orig Wed Sep 19 11:01:27 2012
+++ egg/egg-hkdf.c Wed Oct 24 08:32:31 2012
@@ -39,7 +39,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gpointer buffer = NULL;
gcry_md_hd_t md1, md2;
guint hash_len;
- guchar i;
+ gint i;
gint flags, algo;
gsize step, n_buffer;
guchar *at;
@@ -89,7 +89,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gcry_md_reset (md2);
gcry_md_write (md2, buffer, n_buffer);
gcry_md_write (md2, info, n_info);
- gcry_md_write (md2, &i, 1);
+ gcry_md_putc (md2, i);
n_buffer = hash_len;
memcpy (buffer, gcry_md_read (md2, algo), n_buffer);

4
x11/gnome/keyring/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.85 2012/10/18 12:55:05 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.86 2012/10/24 07:04:03 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= password agent for the GNOME project
GNOME_PROJECT= gnome-keyring
GNOME_VERSION= 3.6.1
REVISION= 0
REVISION= 1
HOMEPAGE= https://live.gnome.org/GnomeKeyring

27
x11/gnome/keyring/patches/patch-egg_egg-hkdf_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-egg_egg-hkdf_c,v 1.1 2012/10/24 07:04:03 ajacoutot Exp $
From 3156ac7c5e20e7fd2cb7096d6401165fb033ee78 Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 22 Oct 2012 20:09:46 +0000
Subject: Fix incorrect loop condition in egg_hkdf_perform()
--- egg/egg-hkdf.c.orig Wed Sep 26 10:28:35 2012
+++ egg/egg-hkdf.c Wed Oct 24 08:35:37 2012
@@ -39,7 +39,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gpointer buffer = NULL;
gcry_md_hd_t md1, md2;
guint hash_len;
- guchar i;
+ gint i;
gint flags, algo;
gsize step, n_buffer;
guchar *at;
@@ -89,7 +89,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gcry_md_reset (md2);
gcry_md_write (md2, buffer, n_buffer);
gcry_md_write (md2, info, n_info);
- gcry_md_write (md2, &i, 1);
+ gcry_md_putc (md2, i);
n_buffer = hash_len;
memcpy (buffer, gcry_md_read (md2, algo), n_buffer);

5
x11/gnome/libgnome-keyring/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2012/09/27 09:01:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2012/10/24 07:04:03 ajacoutot Exp $
COMMENT= library for gnome keyring integration
GNOME_PROJECT= libgnome-keyring
GNOME_VERSION= 3.6.0
REVISION= 0
SHARED_LIBS += gnome-keyring 7.0 # 2.0
@ -23,6 +24,6 @@ MODULES= devel/gettext \
LIB_DEPENDS= security/libgcrypt \
x11/dbus \
devel/glib2>=2.34.0
devel/glib2
.include <bsd.port.mk>

27
x11/gnome/libgnome-keyring/patches/patch-egg_egg-hkdf_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-egg_egg-hkdf_c,v 1.1 2012/10/24 07:04:03 ajacoutot Exp $
From 6d15fac56b6feddef32d57a0ee4697771ea99a8d Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 22 Oct 2012 20:09:46 +0000
Subject: Fix incorrect loop condition in egg_hkdf_perform()
--- egg/egg-hkdf.c.orig Wed Aug 8 21:00:54 2012
+++ egg/egg-hkdf.c Wed Oct 24 08:30:56 2012
@@ -39,7 +39,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gpointer buffer = NULL;
gcry_md_hd_t md1, md2;
guint hash_len;
- guchar i;
+ gint i;
gint flags, algo;
gsize step, n_buffer;
guchar *at;
@@ -89,7 +89,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gcry_md_reset (md2);
gcry_md_write (md2, buffer, n_buffer);
gcry_md_write (md2, info, n_info);
- gcry_md_write (md2, &i, 1);
+ gcry_md_putc (md2, i);
n_buffer = hash_len;
memcpy (buffer, gcry_md_read (md2, algo), n_buffer);

4
x11/gnome/libsecret/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2012/10/16 06:55:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.15 2012/10/24 07:04:03 ajacoutot Exp $
COMMENT= library for storing and retrieving passwords and secrets
GNOME_PROJECT= libsecret
GNOME_VERSION= 0.10
REVISION= 0
REVISION= 1
SHARED_LIBS += secret-1 0.0 # unknown

27
x11/gnome/libsecret/patches/patch-egg_egg-hkdf_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-egg_egg-hkdf_c,v 1.1 2012/10/24 07:04:03 ajacoutot Exp $
From 275d314d5706e412c346fe85027b888cf7d99f76 Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 22 Oct 2012 20:09:46 +0000
Subject: Fix incorrect loop condition in egg_hkdf_perform()
--- egg/egg-hkdf.c.orig Wed Aug 8 07:48:07 2012
+++ egg/egg-hkdf.c Wed Oct 24 08:33:40 2012
@@ -39,7 +39,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gpointer buffer = NULL;
gcry_md_hd_t md1, md2;
guint hash_len;
- guchar i;
+ gint i;
gint flags, algo;
gsize step, n_buffer;
guchar *at;
@@ -89,7 +89,7 @@ egg_hkdf_perform (const gchar *hash_algo, gconstpointe
gcry_md_reset (md2);
gcry_md_write (md2, buffer, n_buffer);
gcry_md_write (md2, info, n_info);
- gcry_md_write (md2, &i, 1);
+ gcry_md_putc (md2, i);
n_buffer = hash_len;
memcpy (buffer, gcry_md_read (md2, algo), n_buffer);