[gnome-keyring: 4/4] Merge branch 'with-hkdf'
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring: 4/4] Merge branch 'with-hkdf'
- Date: Wed, 9 Mar 2011 09:51:05 +0000 (UTC)
commit 655e0e90a4f96de76348f84cab0c64014078fdbb
Merge: ced422b a26d779
Author: Stef Walter <stefw collabora co uk>
Date: Wed Mar 9 10:41:42 2011 +0100
Merge branch 'with-hkdf'
daemon/dbus/gkd-secret-session.c | 44 ++++-
daemon/dbus/gkd-secret-types.h | 1 -
egg/Makefile.am | 2 +
egg/egg-dh.c | 16 +--
egg/egg-dh.h | 2 +-
egg/egg-hkdf.c | 109 ++++++++++++
egg/tests/test-dh.c | 26 ++--
egg/tests/test-hkdf.c | 345 ++++++++++++++++++++++++++++++++++++++
pkcs11/gkm/Makefile.am | 2 +
pkcs11/gkm/gkm-aes-key.c | 24 +++-
pkcs11/gkm/gkm-aes-mechanism.h | 4 -
pkcs11/gkm/gkm-crypto.c | 4 +
pkcs11/gkm/gkm-dh-mechanism.c | 23 +++-
pkcs11/gkm/gkm-generic-key.c | 215 ++++++++++++++++++++++++
pkcs11/gkm/gkm-generic-key.h | 52 ++++++
pkcs11/gkm/gkm-hkdf-mechanism.c | 96 +++++++++++
pkcs11/gkm/gkm-hkdf-mechanism.h | 46 +++++
pkcs11/gkm/gkm-module.c | 12 +-
pkcs11/gkm/gkm-secret-key.c | 11 ++
pkcs11/gkm/gkm-secret-key.h | 7 +
pkcs11/gkm/gkm-types.h | 1 +
pkcs11/pkcs11i.h | 2 +
ui/gku-prompt-tool.c | 14 ++-
ui/gku-prompt.c | 17 ++-
24 files changed, 1024 insertions(+), 51 deletions(-)
---
diff --cc egg/tests/test-dh.c
index 6a2b37f,4a62fd1..13e9c70
--- a/egg/tests/test-dh.c
+++ b/egg/tests/test-dh.c
@@@ -31,8 -34,6 +31,9 @@@
#include <stdio.h>
#include <string.h>
++#include <glib.h>
+#include <gcrypt.h>
+
EGG_SECURE_GLIB_DEFINITIONS ();
static void
@@@ -132,46 -135,45 +135,45 @@@ check_dh_default (const gchar *name, gu
}
static void
-test_dh_default_768 (void)
+test_default_768 (void)
{
- test_dh_default ("ietf-ike-grp-modp-768", 768);
+ check_dh_default ("ietf-ike-grp-modp-768", 768);
}
static void
-test_dh_default_1024 (void)
+test_default_1024 (void)
{
- test_dh_default ("ietf-ike-grp-modp-1024", 1024);
+ check_dh_default ("ietf-ike-grp-modp-1024", 1024);
}
static void
-test_dh_default_1536 (void)
+test_default_1536 (void)
{
- test_dh_default ("ietf-ike-grp-modp-1536", 1536);
+ check_dh_default ("ietf-ike-grp-modp-1536", 1536);
}
-
static void
-test_dh_default_2048 (void)
+test_default_2048 (void)
{
- test_dh_default ("ietf-ike-grp-modp-2048", 2048);
+ check_dh_default ("ietf-ike-grp-modp-2048", 2048);
}
static void
-test_dh_default_3072 (void)
+test_default_3072 (void)
{
- test_dh_default ("ietf-ike-grp-modp-3072", 3072);
+ check_dh_default ("ietf-ike-grp-modp-3072", 3072);
}
static void
-test_dh_default_4096 (void)
+test_default_4096 (void)
{
- test_dh_default ("ietf-ike-grp-modp-4096", 4096);
+ check_dh_default ("ietf-ike-grp-modp-4096", 4096);
}
static void
-test_dh_default_8192 (void)
+test_default_8192 (void)
{
- test_dh_default ("ietf-ike-grp-modp-8192", 8192);
+ check_dh_default ("ietf-ike-grp-modp-8192", 8192);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]