diff options
| author | Werner Koch <wk@gnupg.org> | 2000-01-24 12:55:49 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2000-01-24 12:55:49 +0100 |
| commit | 0070faa0ffd5c366bc20f477a4838b701c20b063 (patch) | |
| tree | 4fb8a63c5f2b7cb4b33a51247bdc8961caa89720 /g10/skclist.c | |
| parent | See ChangeLog: Fri Dec 31 14:06:56 CET 1999 Werner Koch (diff) | |
| download | gnupg2-0070faa0ffd5c366bc20f477a4838b701c20b063.tar.xz gnupg2-0070faa0ffd5c366bc20f477a4838b701c20b063.zip | |
See ChangeLog: Mon Jan 24 13:04:28 CET 2000 Werner Koch
Diffstat (limited to 'g10/skclist.c')
| -rw-r--r-- | g10/skclist.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/g10/skclist.c b/g10/skclist.c index be9769185..8d06364d8 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -30,7 +30,6 @@ #include "packet.h" #include "errors.h" #include "keydb.h" -#include "memory.h" #include "util.h" #include "i18n.h" #include "dummy-cipher.h" @@ -45,7 +44,7 @@ release_sk_list( SK_LIST sk_list ) for( ; sk_list; sk_list = sk_rover ) { sk_rover = sk_list->next; free_secret_key( sk_list->sk ); - m_free( sk_list ); + gcry_free( sk_list ); } } @@ -60,7 +59,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, if( !locusr ) { /* use the default one */ PKT_secret_key *sk; - sk = m_alloc_clear( sizeof *sk ); + sk = gcry_xcalloc( 1, sizeof *sk ); sk->pubkey_usage = use; if( (rc = get_seckey_byname( sk, NULL, unlock )) ) { free_secret_key( sk ); sk = NULL; @@ -75,7 +74,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, free_secret_key( sk ); sk = NULL; } else { - r = m_alloc( sizeof *r ); + r = gcry_xmalloc( sizeof *r ); r->sk = sk; sk = NULL; r->next = sk_list; r->mark = 0; @@ -91,7 +90,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, for(; locusr; locusr = locusr->next ) { PKT_secret_key *sk; - sk = m_alloc_clear( sizeof *sk ); + sk = gcry_xcalloc( 1, sizeof *sk ); sk->pubkey_usage = use; if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) { free_secret_key( sk ); sk = NULL; @@ -107,7 +106,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, free_secret_key( sk ); sk = NULL; } else { - r = m_alloc( sizeof *r ); + r = gcry_xmalloc( sizeof *r ); r->sk = sk; sk = NULL; r->next = sk_list; r->mark = 0; |