diff options
| author | Werner Koch <wk@gnupg.org> | 2013-12-12 15:13:09 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-12-12 15:28:06 +0100 |
| commit | 3b30e9840d4b351c4de73b126e561154cb7df4cc (patch) | |
| tree | ef3d2d1127165ef5866840d33ccde9d35a2dee33 /cipher/kdf.c | |
| parent | cd548ba2dc777b8b27d8d33182ba733c20222120 (diff) | |
| download | libgcrypt-3b30e9840d4b351c4de73b126e561154cb7df4cc.tar.gz | |
Remove macro hacks for internal vs. external functions. Part 2 and last.
* src/visibility.h: Remove remaining define/undef hacks for symbol
visibility. Add macros to detect the use of the public functions.
Change all affected functions by replacing them by the x-macros.
* src/g10lib.h: Add internal prototypes.
(xtrymalloc, xtrycalloc, xtrymalloc_secure, xtrycalloc_secure)
(xtryrealloc, xtrystrdup, xmalloc, xcalloc, xmalloc_secure)
(xcalloc_secure, xrealloc, xstrdup, xfree): New macros.
--
The use of xmalloc/xtrymalloc/xfree is a more common pattern than the
gcry_free etc. functions. Those functions behave like those defined
by C and thus for better readability we use these macros and not
the underscore prefixed functions.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/kdf.c')
| -rw-r--r-- | cipher/kdf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cipher/kdf.c b/cipher/kdf.c index 542752ec..503f0683 100644 --- a/cipher/kdf.c +++ b/cipher/kdf.c @@ -53,7 +53,7 @@ openpgp_s2k (const void *passphrase, size_t passphraselen, && (!salt || saltlen != 8)) return GPG_ERR_INV_VALUE; - secmode = gcry_is_secure (passphrase) || gcry_is_secure (keybuffer); + secmode = _gcry_is_secure (passphrase) || _gcry_is_secure (keybuffer); ec = _gcry_md_open (&md, hashalgo, secmode? GCRY_MD_FLAG_SECURE : 0); if (ec) @@ -149,7 +149,7 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, if (!hlen) return GPG_ERR_DIGEST_ALGO; - secmode = gcry_is_secure (passphrase) || gcry_is_secure (keybuffer); + secmode = _gcry_is_secure (passphrase) || _gcry_is_secure (keybuffer); /* We ignore step 1 from pksc5v2.1 which demands a check that dklen is not larger that 0xffffffff * hlen. */ @@ -160,8 +160,8 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, /* Setup buffers and prepare a hash context. */ sbuf = (secmode - ? gcry_malloc_secure (saltlen + 4 + hlen + hlen) - : gcry_malloc (saltlen + 4 + hlen + hlen)); + ? xtrymalloc_secure (saltlen + 4 + hlen + hlen) + : xtrymalloc (saltlen + 4 + hlen + hlen)); if (!sbuf) return gpg_err_code_from_syserror (); tbuf = sbuf + saltlen + 4; @@ -171,7 +171,7 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, | (secmode?GCRY_MD_FLAG_SECURE:0))); if (ec) { - gcry_free (sbuf); + xfree (sbuf); return ec; } @@ -185,7 +185,7 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, if (ec) { _gcry_md_close (md); - gcry_free (sbuf); + xfree (sbuf); return ec; } if (!iter) /* Compute U_1: */ @@ -216,7 +216,7 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, } _gcry_md_close (md); - gcry_free (sbuf); + xfree (sbuf); return 0; } |