[libgnome-keyring: 2/2] Merge branch 'with-hkdf'

[Stefan Walter <stefw src gnome org>]

commit 72c848d00d7d943fc15a7371d8b2ab620db7f80f
Merge: 49f62e1 100aa17
Author: Stef Walter <stefw collabora co uk>
Date:   Wed Mar 9 10:52:04 2011 +0100

    Merge branch 'with-hkdf'

 .gitignore                      |    2 +
 configure.in                    |    4 +
 egg/Makefile.am                 |    3 +-
 egg/egg-dh.c                    |   16 +--
 egg/egg-dh.h                    |    2 +-
 egg/egg-hkdf.c                  |  109 ++++++++++++
 egg/egg-hkdf.h                  |   39 +++++
 egg/egg-testing.c               |   72 ++++++++
 egg/egg-testing.h               |   14 ++
 egg/tests/Makefile.am           |    5 +
 egg/tests/test-dh.c             |    8 +-
 egg/tests/test-hkdf.c           |  345 +++++++++++++++++++++++++++++++++++++++
 library/gkr-session.c           |  173 +++++++++++++++++++-
 library/tests/Makefile.am       |    3 +-
 library/tests/test-any-daemon.c |   78 +++++++++
 15 files changed, 847 insertions(+), 26 deletions(-)
---