projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdates
[gnulib.git]
/
lib
/
gc-libgcrypt.c
diff --git
a/lib/gc-libgcrypt.c
b/lib/gc-libgcrypt.c
index
180fee9
..
46a6e53
100644
(file)
--- a/
lib/gc-libgcrypt.c
+++ b/
lib/gc-libgcrypt.c
@@
-1,5
+1,6
@@
/* gc-libgcrypt.c --- Crypto wrappers around Libgcrypt for GC.
/* gc-libgcrypt.c --- Crypto wrappers around Libgcrypt for GC.
- * Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
@@
-20,18
+21,26
@@
/* Note: This file is only built if GC uses Libgcrypt. */
/* Note: This file is only built if GC uses Libgcrypt. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Get prototype. */
#include "gc.h"
/* Get prototype. */
#include "gc.h"
+#include <stdlib.h>
+#include <string.h>
+
/* Get libgcrypt API. */
#include <gcrypt.h>
/* Get libgcrypt API. */
#include <gcrypt.h>
+#ifdef GNULIB_GC_MD2
+# include "md2.h"
+#endif
#include <assert.h>
#include <assert.h>
+#ifndef MIN_GCRYPT_VERSION
+# define MIN_GCRYPT_VERSION "1.4.4"
+#endif
+
/* Initialization. */
Gc_rc
/* Initialization. */
Gc_rc
@@
-42,12
+51,15
@@
gc_init (void)
err = gcry_control (GCRYCTL_ANY_INITIALIZATION_P);
if (err == GPG_ERR_NO_ERROR)
{
err = gcry_control (GCRYCTL_ANY_INITIALIZATION_P);
if (err == GPG_ERR_NO_ERROR)
{
- if (gcry_check_version (GCRYPT_VERSION) == NULL)
- return GC_INIT_ERROR;
+ if (gcry_control (GCRYCTL_DISABLE_SECMEM, NULL, 0))
+ return GC_INIT_ERROR;
+
+ if (gcry_check_version (MIN_GCRYPT_VERSION) == NULL)
+ return GC_INIT_ERROR;
err = gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);
if (err != GPG_ERR_NO_ERROR)
err = gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL, 0);
if (err != GPG_ERR_NO_ERROR)
- return GC_INIT_ERROR;
+
return GC_INIT_ERROR;
}
return GC_OK;
}
return GC_OK;
@@
-59,6
+71,8
@@
gc_done (void)
return;
}
return;
}
+#ifdef GNULIB_GC_RANDOM
+
/* Randomness. */
Gc_rc
/* Randomness. */
Gc_rc
@@
-82,23
+96,25
@@
gc_random (char *data, size_t datalen)
return GC_OK;
}
return GC_OK;
}
+#endif
+
/* Memory allocation. */
void
gc_set_allocators (gc_malloc_t func_malloc,
/* Memory allocation. */
void
gc_set_allocators (gc_malloc_t func_malloc,
- gc_malloc_t secure_malloc,
- gc_secure_check_t secure_check,
- gc_realloc_t func_realloc, gc_free_t func_free)
+
gc_malloc_t secure_malloc,
+
gc_secure_check_t secure_check,
+
gc_realloc_t func_realloc, gc_free_t func_free)
{
gcry_set_allocation_handler (func_malloc, secure_malloc, secure_check,
{
gcry_set_allocation_handler (func_malloc, secure_malloc, secure_check,
- func_realloc, func_free);
+
func_realloc, func_free);
}
/* Ciphers. */
Gc_rc
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
}
/* Ciphers. */
Gc_rc
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
- gc_cipher_handle * outhandle)
+
gc_cipher_handle * outhandle)
{
int gcryalg, gcrymode;
gcry_error_t err;
{
int gcryalg, gcrymode;
gcry_error_t err;
@@
-134,12
+150,26
@@
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
gcryalg = GCRY_CIPHER_RFC2268_40;
break;
gcryalg = GCRY_CIPHER_RFC2268_40;
break;
+#ifdef HAVE_CAMELLIA
+ case GC_CAMELLIA128:
+ gcryalg = GCRY_CIPHER_CAMELLIA128;
+ break;
+
+ case GC_CAMELLIA256:
+ gcryalg = GCRY_CIPHER_CAMELLIA256;
+ break;
+#endif
+
default:
return GC_INVALID_CIPHER;
}
switch (mode)
{
default:
return GC_INVALID_CIPHER;
}
switch (mode)
{
+ case GC_ECB:
+ gcrymode = GCRY_CIPHER_MODE_ECB;
+ break;
+
case GC_CBC:
gcrymode = GCRY_CIPHER_MODE_CBC;
break;
case GC_CBC:
gcrymode = GCRY_CIPHER_MODE_CBC;
break;
@@
-153,7
+183,7
@@
gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
}
err = gcry_cipher_open ((gcry_cipher_hd_t *) outhandle,
}
err = gcry_cipher_open ((gcry_cipher_hd_t *) outhandle,
- gcryalg, gcrymode, 0);
+
gcryalg, gcrymode, 0);
if (gcry_err_code (err))
return GC_INVALID_CIPHER;
if (gcry_err_code (err))
return GC_INVALID_CIPHER;
@@
-188,7
+218,7
@@
Gc_rc
gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data)
{
if (gcry_cipher_encrypt ((gcry_cipher_hd_t) handle,
gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data)
{
if (gcry_cipher_encrypt ((gcry_cipher_hd_t) handle,
- data, len, NULL, len) != 0)
+
data, len, NULL, len) != 0)
return GC_INVALID_CIPHER;
return GC_OK;
return GC_INVALID_CIPHER;
return GC_OK;
@@
-198,7
+228,7
@@
Gc_rc
gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data)
{
if (gcry_cipher_decrypt ((gcry_cipher_hd_t) handle,
gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data)
{
if (gcry_cipher_decrypt ((gcry_cipher_hd_t) handle,
- data, len, NULL, len) != 0)
+
data, len, NULL, len) != 0)
return GC_INVALID_CIPHER;
return GC_OK;
return GC_INVALID_CIPHER;
return GC_OK;
@@
-214,14
+244,37
@@
gc_cipher_close (gc_cipher_handle handle)
/* Hashes. */
/* Hashes. */
+typedef struct _gc_hash_ctx {
+ Gc_hash alg;
+ Gc_hash_mode mode;
+ gcry_md_hd_t gch;
+#ifdef GNULIB_GC_MD2
+ char hash[GC_MD2_DIGEST_SIZE];
+ struct md2_ctx md2Context;
+#endif
+} _gc_hash_ctx;
+
Gc_rc
gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle)
{
Gc_rc
gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle)
{
- int gcryalg, gcrymode;
+ _gc_hash_ctx *ctx;
+ int gcryalg = 0, gcrymode = 0;
gcry_error_t err;
gcry_error_t err;
+ Gc_rc rc = GC_OK;
+
+ ctx = calloc (sizeof (*ctx), 1);
+ if (!ctx)
+ return GC_MALLOC_ERROR;
+
+ ctx->alg = hash;
+ ctx->mode = mode;
switch (hash)
{
switch (hash)
{
+ case GC_MD2:
+ gcryalg = GCRY_MD_NONE;
+ break;
+
case GC_MD4:
gcryalg = GCRY_MD_MD4;
break;
case GC_MD4:
gcryalg = GCRY_MD_MD4;
break;
@@
-234,12
+287,28
@@
gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle)
gcryalg = GCRY_MD_SHA1;
break;
gcryalg = GCRY_MD_SHA1;
break;
+ case GC_SHA256:
+ gcryalg = GCRY_MD_SHA256;
+ break;
+
+ case GC_SHA384:
+ gcryalg = GCRY_MD_SHA384;
+ break;
+
+ case GC_SHA512:
+ gcryalg = GCRY_MD_SHA512;
+ break;
+
+ case GC_SHA224:
+ gcryalg = GCRY_MD_SHA224;
+ break;
+
case GC_RMD160:
gcryalg = GCRY_MD_RMD160;
break;
default:
case GC_RMD160:
gcryalg = GCRY_MD_RMD160;
break;
default:
- r
eturn
GC_INVALID_HASH;
+ r
c =
GC_INVALID_HASH;
}
switch (mode)
}
switch (mode)
@@
-253,24
+322,43
@@
gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle)
break;
default:
break;
default:
- r
eturn
GC_INVALID_HASH;
+ r
c =
GC_INVALID_HASH;
}
}
- err = gcry_md_open ((gcry_md_hd_t *) outhandle, gcryalg, gcrymode);
- if (gcry_err_code (err))
- return GC_INVALID_HASH;
+ if (rc == GC_OK && gcryalg != GCRY_MD_NONE)
+ {
+ err = gcry_md_open (&ctx->gch, gcryalg, gcrymode);
+ if (gcry_err_code (err))
+ rc = GC_INVALID_HASH;
+ }
- return GC_OK;
+ if (rc == GC_OK)
+ *outhandle = ctx;
+ else
+ free (ctx);
+
+ return rc;
}
Gc_rc
gc_hash_clone (gc_hash_handle handle, gc_hash_handle * outhandle)
{
}
Gc_rc
gc_hash_clone (gc_hash_handle handle, gc_hash_handle * outhandle)
{
+ _gc_hash_ctx *in = handle;
+ _gc_hash_ctx *out;
int err;
int err;
- err = gcry_md_copy ((gcry_md_hd_t *) outhandle, (gcry_md_hd_t) handle);
+ *outhandle = out = calloc (sizeof (*out), 1);
+ if (!out)
+ return GC_MALLOC_ERROR;
+
+ memcpy (out, in, sizeof (*out));
+
+ err = gcry_md_copy (&out->gch, in->gch);
if (err)
if (err)
- return GC_INVALID_HASH;
+ {
+ free (out);
+ return GC_INVALID_HASH;
+ }
return GC_OK;
}
return GC_OK;
}
@@
-278,52
+366,94
@@
gc_hash_clone (gc_hash_handle handle, gc_hash_handle * outhandle)
size_t
gc_hash_digest_length (Gc_hash hash)
{
size_t
gc_hash_digest_length (Gc_hash hash)
{
-
int gcryalg
;
+
size_t len
;
switch (hash)
{
switch (hash)
{
+ case GC_MD2:
+ len = GC_MD2_DIGEST_SIZE;
+ break;
+
case GC_MD4:
case GC_MD4:
-
gcryalg = GCRY_MD_MD4
;
+
len = GC_MD4_DIGEST_SIZE
;
break;
case GC_MD5:
break;
case GC_MD5:
- gcryalg = GCRY_MD_MD5;
+ len = GC_MD5_DIGEST_SIZE;
+ break;
+
+ case GC_RMD160:
+ len = GC_RMD160_DIGEST_SIZE;
break;
case GC_SHA1:
break;
case GC_SHA1:
-
gcryalg = GCRY_MD_SHA1
;
+
len = GC_SHA1_DIGEST_SIZE
;
break;
break;
- case GC_RMD160:
- gcryalg = GCRY_MD_RMD160;
+ case GC_SHA256:
+ len = GC_SHA256_DIGEST_SIZE;
+ break;
+
+ case GC_SHA384:
+ len = GC_SHA384_DIGEST_SIZE;
+ break;
+
+ case GC_SHA512:
+ len = GC_SHA512_DIGEST_SIZE;
+ break;
+
+ case GC_SHA224:
+ len = GC_SHA224_DIGEST_SIZE;
break;
default:
return 0;
}
break;
default:
return 0;
}
- return
gcry_md_get_algo_dlen (gcryalg)
;
+ return
len
;
}
void
gc_hash_hmac_setkey (gc_hash_handle handle, size_t len, const char *key)
{
}
void
gc_hash_hmac_setkey (gc_hash_handle handle, size_t len, const char *key)
{
- gcry_md_setkey ((gcry_md_hd_t) handle, key, len);
+ _gc_hash_ctx *ctx = handle;
+#ifdef GNULIB_GC_MD2
+ if (ctx->alg != GC_MD2)
+#endif
+ gcry_md_setkey (ctx->gch, key, len);
}
void
gc_hash_write (gc_hash_handle handle, size_t len, const char *data)
{
}
void
gc_hash_write (gc_hash_handle handle, size_t len, const char *data)
{
- gcry_md_write ((gcry_md_hd_t) handle, data, len);
+ _gc_hash_ctx *ctx = handle;
+
+#ifdef GNULIB_GC_MD2
+ if (ctx->alg == GC_MD2)
+ md2_process_bytes (data, len, &ctx->md2Context);
+ else
+#endif
+ gcry_md_write (ctx->gch, data, len);
}
const char *
gc_hash_read (gc_hash_handle handle)
{
}
const char *
gc_hash_read (gc_hash_handle handle)
{
+ _gc_hash_ctx *ctx = handle;
const char *digest;
const char *digest;
- gcry_md_final ((gcry_md_hd_t) handle);
- digest = gcry_md_read ((gcry_md_hd_t) handle, 0);
+#ifdef GNULIB_GC_MD2
+ if (ctx->alg == GC_MD2)
+ {
+ md2_finish_ctx (&ctx->md2Context, ctx->hash);
+ digest = ctx->hash;
+ }
+ else
+#endif
+ {
+ gcry_md_final (ctx->gch);
+ digest = gcry_md_read (ctx->gch, 0);
+ }
return digest;
}
return digest;
}
@@
-331,7
+461,14
@@
gc_hash_read (gc_hash_handle handle)
void
gc_hash_close (gc_hash_handle handle)
{
void
gc_hash_close (gc_hash_handle handle)
{
- gcry_md_close ((gcry_md_hd_t) handle);
+ _gc_hash_ctx *ctx = handle;
+
+#ifdef GNULIB_GC_MD2
+ if (ctx->alg != GC_MD2)
+#endif
+ gcry_md_close (ctx->gch);
+
+ free (ctx);
}
Gc_rc
}
Gc_rc
@@
-341,25
+478,56
@@
gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
switch (hash)
{
switch (hash)
{
-#ifdef GC_USE_MD4
+#ifdef GNULIB_GC_MD2
+ case GC_MD2:
+ md2_buffer (in, inlen, resbuf);
+ return GC_OK;
+ break;
+#endif
+
+#ifdef GNULIB_GC_MD4
case GC_MD4:
gcryalg = GCRY_MD_MD4;
break;
#endif
case GC_MD4:
gcryalg = GCRY_MD_MD4;
break;
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
case GC_MD5:
gcryalg = GCRY_MD_MD5;
break;
#endif
case GC_MD5:
gcryalg = GCRY_MD_MD5;
break;
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
case GC_SHA1:
gcryalg = GCRY_MD_SHA1;
break;
#endif
case GC_SHA1:
gcryalg = GCRY_MD_SHA1;
break;
#endif
-#ifdef GC_USE_RMD160
+#ifdef GNULIB_GC_SHA256
+ case GC_SHA256:
+ gcryalg = GCRY_MD_SHA256;
+ break;
+#endif
+
+#ifdef GNULIB_GC_SHA384
+ case GC_SHA384:
+ gcryalg = GCRY_MD_SHA384;
+ break;
+#endif
+
+#ifdef GNULIB_GC_SHA512
+ case GC_SHA512:
+ gcryalg = GCRY_MD_SHA512;
+ break;
+#endif
+
+#ifdef GNULIB_GC_SHA224
+ case GC_SHA224:
+ gcryalg = GCRY_MD_SHA224;
+ break;
+#endif
+
+#ifdef GNULIB_GC_RMD160
case GC_RMD160:
gcryalg = GCRY_MD_RMD160;
break;
case GC_RMD160:
gcryalg = GCRY_MD_RMD160;
break;
@@
-376,7
+544,16
@@
gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf)
/* One-call interface. */
/* One-call interface. */
-#ifdef GC_USE_MD4
+#ifdef GNULIB_GC_MD2
+Gc_rc
+gc_md2 (const void *in, size_t inlen, void *resbuf)
+{
+ md2_buffer (in, inlen, resbuf);
+ return GC_OK;
+}
+#endif
+
+#ifdef GNULIB_GC_MD4
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
@@
-408,7
+585,7
@@
gc_md4 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_MD5
+#ifdef G
NULIB_GC
_MD5
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
@@
-440,7
+617,7
@@
gc_md5 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_SHA1
+#ifdef G
NULIB_GC
_SHA1
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
@@
-472,10
+649,10
@@
gc_sha1 (const void *in, size_t inlen, void *resbuf)
}
#endif
}
#endif
-#ifdef G
C_USE
_HMAC_MD5
+#ifdef G
NULIB_GC
_HMAC_MD5
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
- const void *in, size_t inlen, char *resbuf)
+
const void *in, size_t inlen, char *resbuf)
{
size_t hlen = gcry_md_get_algo_dlen (GCRY_MD_MD5);
gcry_md_hd_t mdh;
{
size_t hlen = gcry_md_get_algo_dlen (GCRY_MD_MD5);
gcry_md_hd_t mdh;
@@
-512,10
+689,10
@@
gc_hmac_md5 (const void *key, size_t keylen,
}
#endif
}
#endif
-#ifdef G
C_USE
_HMAC_SHA1
+#ifdef G
NULIB_GC
_HMAC_SHA1
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
- const void *in, size_t inlen, char *resbuf)
+
const void *in, size_t inlen, char *resbuf)
{
size_t hlen = gcry_md_get_algo_dlen (GCRY_MD_SHA1);
gcry_md_hd_t mdh;
{
size_t hlen = gcry_md_get_algo_dlen (GCRY_MD_SHA1);
gcry_md_hd_t mdh;