[gnome-keyring: 2/2] Merge branch 'track-memory'

[Stefan Walter <stefw src gnome org>]

commit d5629603cc2d6785e4add32326c333ef327d7562
Merge: 26fb02a 3f60c65
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Sep 19 09:39:28 2011 +0200

    Merge branch 'track-memory'

 daemon/control/gkd-control-client.c     |    2 +
 daemon/control/gkd-control-server.c     |    2 +
 daemon/dbus/gkd-secret-unlock.c         |    2 +
 daemon/gkd-main.c                       |   60 ++++++
 daemon/gpg-agent/gkd-gpg-agent-ops.c    |    2 +
 daemon/ssh-agent/gkd-ssh-agent-ops.c    |    3 +-
 daemon/ssh-agent/gkd-ssh-agent.c        |    2 +
 egg/egg-dh.c                            |    2 +
 egg/egg-entry-buffer.c                  |    2 +
 egg/egg-libgcrypt.c                     |    2 +
 egg/egg-openssl.c                       |    2 +
 egg/egg-secure-memory.c                 |  309 +++++++++++++++++++------------
 egg/egg-secure-memory.h                 |   31 +++-
 egg/egg-symkey.c                        |    2 +
 egg/tests/test-secmem.c                 |   24 ++-
 gcr/gcr-parser.c                        |    2 +
 pkcs11/gkm/gkm-aes-key.c                |    2 +
 pkcs11/gkm/gkm-aes-mechanism.c          |    2 +
 pkcs11/gkm/gkm-data-der.c               |    2 +
 pkcs11/gkm/gkm-dh-mechanism.c           |    2 +
 pkcs11/gkm/gkm-generic-key.c            |    2 +
 pkcs11/gkm/gkm-hkdf-mechanism.c         |    2 +
 pkcs11/gkm/gkm-null-mechanism.c         |    2 +
 pkcs11/gkm/gkm-secret.c                 |    2 +
 pkcs11/gnome2-store/gkm-gnome2-file.c   |    2 +
 pkcs11/secret-store/gkm-secret-binary.c |    2 +
 pkcs11/wrap-layer/gkm-wrap-login.c      |    2 +
 ui/gku-prompt-tool.c                    |    2 +
 ui/gku-prompt-util.c                    |    2 +
 ui/gku-prompt.c                         |    2 +
 ui/tests/test-util.c                    |    2 +
 31 files changed, 342 insertions(+), 137 deletions(-)
---