[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: gc: remove redundant macro definitions
From: |
Bruno Haible |
Subject: |
Re: gc: remove redundant macro definitions |
Date: |
Mon, 8 Jan 2007 20:47:14 +0100 |
User-agent: |
KMail/1.9.1 |
Simon Josefsson wrote:
> It seems fine, please install it and I'll test it.
I installed this instead:
2007-01-08 Bruno Haible <address@hidden>
* m4/gc-arcfour.m4 (gl_GC_ARCFOUR): Remove GC_USE_ARCFOUR macro
definition.
* m4/gc-arctwo.m4 (gl_GC_ARCTWO): Remove GC_USE_ARCTWO macro
definition.
* m4/gc-des.m4 (gl_GC_DES): Remove GC_USE_DES macro definition.
* m4/gc-hmac-md5.m4 (gl_GC_HMAC_MD5): Remove GC_USE_HMAC_MD5 macro
definition.
* m4/gc-hmac-sha1.m4 (gl_GC_HMAC_SHA1): Remove GC_USE_HMAC_SHA1 macro
definition.
* m4/gc-md2.m4 (gl_GC_MD2): Remove GC_USE_MD2 macro definition.
* m4/gc-md4.m4 (gl_GC_MD4): Remove GC_USE_MD4 macro definition.
* m4/gc-md5.m4 (gl_GC_MD5): Remove GC_USE_MD5 macro definition.
* m4/gc-random.m4 (gl_GC_RANDOM): Remove GC_USE_RANDOM macro
definition.
* m4/gc-rijndael.m4 (gl_GC_RIJNDAEL): Remove GC_USE_RIJNDAEL macro
definition.
* m4/gc-sha1.m4 (gl_GC_SHA1): Remove GC_USE_SHA1 macro definition.
* lib/gc-gnulib.c: Use GNULIB_GC_<algorithm> instead of
GC_USE_<algorithm>.
* lib/gc-libgcrypt.c: Likewise.
* modules/gc-arcfour (configure.ac): Use gl_MODULE_INDICATOR.
* modules/gc-arctwo (configure.ac): Likewise.
* modules/gc-des (configure.ac): Likewise.
* modules/gc-hmac-md5 (configure.ac): Likewise.
* modules/gc-hmac-sha1 (configure.ac): Likewise.
* modules/gc-md2 (configure.ac): Likewise.
* modules/gc-md4 (configure.ac): Likewise.
* modules/gc-md5 (configure.ac): Likewise.
* modules/gc-random (configure.ac): Likewise.
* modules/gc-rijndael (configure.ac): Likewise.
* modules/gc-sha1 (configure.ac): Likewise.
diff -c -3 -r1.20 gc-gnulib.c
*** lib/gc-gnulib.c 29 Oct 2006 21:52:55 -0000 1.20
--- lib/gc-gnulib.c 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
/* gc-gnulib.c --- Common gnulib internal crypto interface functions
! * Copyright (C) 2002, 2003, 2004, 2005, 2006 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
--- 1,5 ----
/* gc-gnulib.c --- Common gnulib internal crypto interface functions
! * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
***************
*** 29,35 ****
#include <string.h>
/* For randomize. */
! #ifdef GC_USE_RANDOM
# include <unistd.h>
# include <sys/types.h>
# include <sys/stat.h>
--- 29,35 ----
#include <string.h>
/* For randomize. */
! #ifdef GNULIB_GC_RANDOM
# include <unistd.h>
# include <sys/types.h>
# include <sys/stat.h>
***************
*** 38,70 ****
#endif
/* Hashes. */
! #ifdef GC_USE_MD2
# include "md2.h"
#endif
! #ifdef GC_USE_MD4
# include "md4.h"
#endif
! #ifdef GC_USE_MD5
# include "md5.h"
#endif
! #ifdef GC_USE_SHA1
# include "sha1.h"
#endif
! #if defined(GC_USE_HMAC_MD5) || defined(GC_USE_HMAC_SHA1)
# include "hmac.h"
#endif
/* Ciphers. */
! #ifdef GC_USE_ARCFOUR
# include "arcfour.h"
#endif
! #ifdef GC_USE_ARCTWO
# include "arctwo.h"
#endif
! #ifdef GC_USE_DES
# include "des.h"
#endif
! #ifdef GC_USE_RIJNDAEL
# include "rijndael-api-fst.h"
#endif
--- 38,70 ----
#endif
/* Hashes. */
! #ifdef GNULIB_GC_MD2
# include "md2.h"
#endif
! #ifdef GNULIB_GC_MD4
# include "md4.h"
#endif
! #ifdef GNULIB_GC_MD5
# include "md5.h"
#endif
! #ifdef GNULIB_GC_SHA1
# include "sha1.h"
#endif
! #if defined(GNULIB_GC_HMAC_MD5) || defined(GNULIB_GC_HMAC_SHA1)
# include "hmac.h"
#endif
/* Ciphers. */
! #ifdef GNULIB_GC_ARCFOUR
# include "arcfour.h"
#endif
! #ifdef GNULIB_GC_ARCTWO
# include "arctwo.h"
#endif
! #ifdef GNULIB_GC_DES
# include "des.h"
#endif
! #ifdef GNULIB_GC_RIJNDAEL
# include "rijndael-api-fst.h"
#endif
***************
*** 80,86 ****
return;
}
! #ifdef GC_USE_RANDOM
/* Randomness. */
--- 80,86 ----
return;
}
! #ifdef GNULIB_GC_RANDOM
/* Randomness. */
***************
*** 174,190 ****
typedef struct _gc_cipher_ctx {
Gc_cipher alg;
Gc_cipher_mode mode;
! #ifdef GC_USE_ARCTWO
arctwo_context arctwoContext;
char arctwoIV[ARCTWO_BLOCK_SIZE];
#endif
! #ifdef GC_USE_ARCFOUR
arcfour_context arcfourContext;
#endif
! #ifdef GC_USE_DES
des_ctx desContext;
#endif
! #ifdef GC_USE_RIJNDAEL
rijndaelKeyInstance aesEncKey;
rijndaelKeyInstance aesDecKey;
rijndaelCipherInstance aesContext;
--- 174,190 ----
typedef struct _gc_cipher_ctx {
Gc_cipher alg;
Gc_cipher_mode mode;
! #ifdef GNULIB_GC_ARCTWO
arctwo_context arctwoContext;
char arctwoIV[ARCTWO_BLOCK_SIZE];
#endif
! #ifdef GNULIB_GC_ARCFOUR
arcfour_context arcfourContext;
#endif
! #ifdef GNULIB_GC_DES
des_ctx desContext;
#endif
! #ifdef GNULIB_GC_RIJNDAEL
rijndaelKeyInstance aesEncKey;
rijndaelKeyInstance aesDecKey;
rijndaelCipherInstance aesContext;
***************
*** 207,213 ****
switch (alg)
{
! #ifdef GC_USE_ARCTWO
case GC_ARCTWO40:
switch (mode)
{
--- 207,213 ----
switch (alg)
{
! #ifdef GNULIB_GC_ARCTWO
case GC_ARCTWO40:
switch (mode)
{
***************
*** 221,227 ****
break;
#endif
! #ifdef GC_USE_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
switch (mode)
--- 221,227 ----
break;
#endif
! #ifdef GNULIB_GC_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
switch (mode)
***************
*** 235,241 ****
break;
#endif
! #ifdef GC_USE_DES
case GC_DES:
switch (mode)
{
--- 235,241 ----
break;
#endif
! #ifdef GNULIB_GC_DES
case GC_DES:
switch (mode)
{
***************
*** 248,254 ****
break;
#endif
! #ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
--- 248,254 ----
break;
#endif
! #ifdef GNULIB_GC_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
***************
*** 283,302 ****
switch (ctx->alg)
{
! #ifdef GC_USE_ARCTWO
case GC_ARCTWO40:
arctwo_setkey (&ctx->arctwoContext, keylen, key);
break;
#endif
! #ifdef GC_USE_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_setkey (&ctx->arcfourContext, key, keylen);
break;
#endif
! #ifdef GC_USE_DES
case GC_DES:
if (keylen != 8)
return GC_INVALID_CIPHER;
--- 283,302 ----
switch (ctx->alg)
{
! #ifdef GNULIB_GC_ARCTWO
case GC_ARCTWO40:
arctwo_setkey (&ctx->arctwoContext, keylen, key);
break;
#endif
! #ifdef GNULIB_GC_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_setkey (&ctx->arcfourContext, key, keylen);
break;
#endif
! #ifdef GNULIB_GC_DES
case GC_DES:
if (keylen != 8)
return GC_INVALID_CIPHER;
***************
*** 304,310 ****
break;
#endif
! #ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
--- 304,310 ----
break;
#endif
! #ifdef GNULIB_GC_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
***************
*** 347,353 ****
switch (ctx->alg)
{
! #ifdef GC_USE_ARCTWO
case GC_ARCTWO40:
if (ivlen != ARCTWO_BLOCK_SIZE)
return GC_INVALID_CIPHER;
--- 347,353 ----
switch (ctx->alg)
{
! #ifdef GNULIB_GC_ARCTWO
case GC_ARCTWO40:
if (ivlen != ARCTWO_BLOCK_SIZE)
return GC_INVALID_CIPHER;
***************
*** 355,361 ****
break;
#endif
! #ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
--- 355,361 ----
break;
#endif
! #ifdef GNULIB_GC_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
***************
*** 401,407 ****
switch (ctx->alg)
{
! #ifdef GC_USE_ARCTWO
case GC_ARCTWO40:
switch (ctx->mode)
{
--- 401,407 ----
switch (ctx->alg)
{
! #ifdef GNULIB_GC_ARCTWO
case GC_ARCTWO40:
switch (ctx->mode)
{
***************
*** 428,448 ****
break;
#endif
! #ifdef GC_USE_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
! #ifdef GC_USE_DES
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
des_ecb_encrypt (&ctx->desContext, data, data);
break;
#endif
! #ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
--- 428,448 ----
break;
#endif
! #ifdef GNULIB_GC_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
! #ifdef GNULIB_GC_DES
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
des_ecb_encrypt (&ctx->desContext, data, data);
break;
#endif
! #ifdef GNULIB_GC_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
***************
*** 471,477 ****
switch (ctx->alg)
{
! #ifdef GC_USE_ARCTWO
case GC_ARCTWO40:
switch (ctx->mode)
{
--- 471,477 ----
switch (ctx->alg)
{
! #ifdef GNULIB_GC_ARCTWO
case GC_ARCTWO40:
switch (ctx->mode)
{
***************
*** 500,520 ****
break;
#endif
! #ifdef GC_USE_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
! #ifdef GC_USE_DES
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
des_ecb_decrypt (&ctx->desContext, data, data);
break;
#endif
! #ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
--- 500,520 ----
break;
#endif
! #ifdef GNULIB_GC_ARCFOUR
case GC_ARCFOUR128:
case GC_ARCFOUR40:
arcfour_stream (&ctx->arcfourContext, data, data, len);
break;
#endif
! #ifdef GNULIB_GC_DES
case GC_DES:
for (; len >= 8; len -= 8, data += 8)
des_ecb_decrypt (&ctx->desContext, data, data);
break;
#endif
! #ifdef GNULIB_GC_RIJNDAEL
case GC_AES128:
case GC_AES192:
case GC_AES256:
***************
*** 555,570 ****
Gc_hash alg;
Gc_hash_mode mode;
char hash[MAX_DIGEST_SIZE];
! #ifdef GC_USE_MD2
struct md2_ctx md2Context;
#endif
! #ifdef GC_USE_MD4
struct md4_ctx md4Context;
#endif
! #ifdef GC_USE_MD5
struct md5_ctx md5Context;
#endif
! #ifdef GC_USE_SHA1
struct sha1_ctx sha1Context;
#endif
} _gc_hash_ctx;
--- 555,570 ----
Gc_hash alg;
Gc_hash_mode mode;
char hash[MAX_DIGEST_SIZE];
! #ifdef GNULIB_GC_MD2
struct md2_ctx md2Context;
#endif
! #ifdef GNULIB_GC_MD4
struct md4_ctx md4Context;
#endif
! #ifdef GNULIB_GC_MD5
struct md5_ctx md5Context;
#endif
! #ifdef GNULIB_GC_SHA1
struct sha1_ctx sha1Context;
#endif
} _gc_hash_ctx;
***************
*** 582,606 ****
switch (hash)
{
! #ifdef GC_USE_MD2
case GC_MD2:
md2_init_ctx (&ctx->md2Context);
break;
#endif
! #ifdef GC_USE_MD4
case GC_MD4:
md4_init_ctx (&ctx->md4Context);
break;
#endif
! #ifdef GC_USE_MD5
case GC_MD5:
md5_init_ctx (&ctx->md5Context);
break;
#endif
! #ifdef GC_USE_SHA1
case GC_SHA1:
sha1_init_ctx (&ctx->sha1Context);
break;
--- 582,606 ----
switch (hash)
{
! #ifdef GNULIB_GC_MD2
case GC_MD2:
md2_init_ctx (&ctx->md2Context);
break;
#endif
! #ifdef GNULIB_GC_MD4
case GC_MD4:
md4_init_ctx (&ctx->md4Context);
break;
#endif
! #ifdef GNULIB_GC_MD5
case GC_MD5:
md5_init_ctx (&ctx->md5Context);
break;
#endif
! #ifdef GNULIB_GC_SHA1
case GC_SHA1:
sha1_init_ctx (&ctx->sha1Context);
break;
***************
*** 685,709 ****
switch (ctx->alg)
{
! #ifdef GC_USE_MD2
case GC_MD2:
md2_process_bytes (data, len, &ctx->md2Context);
break;
#endif
! #ifdef GC_USE_MD4
case GC_MD4:
md4_process_bytes (data, len, &ctx->md4Context);
break;
#endif
! #ifdef GC_USE_MD5
case GC_MD5:
md5_process_bytes (data, len, &ctx->md5Context);
break;
#endif
! #ifdef GC_USE_SHA1
case GC_SHA1:
sha1_process_bytes (data, len, &ctx->sha1Context);
break;
--- 685,709 ----
switch (ctx->alg)
{
! #ifdef GNULIB_GC_MD2
case GC_MD2:
md2_process_bytes (data, len, &ctx->md2Context);
break;
#endif
! #ifdef GNULIB_GC_MD4
case GC_MD4:
md4_process_bytes (data, len, &ctx->md4Context);
break;
#endif
! #ifdef GNULIB_GC_MD5
case GC_MD5:
md5_process_bytes (data, len, &ctx->md5Context);
break;
#endif
! #ifdef GNULIB_GC_SHA1
case GC_SHA1:
sha1_process_bytes (data, len, &ctx->sha1Context);
break;
***************
*** 722,749 ****
switch (ctx->alg)
{
! #ifdef GC_USE_MD2
case GC_MD2:
md2_finish_ctx (&ctx->md2Context, ctx->hash);
ret = ctx->hash;
break;
#endif
! #ifdef GC_USE_MD4
case GC_MD4:
md4_finish_ctx (&ctx->md4Context, ctx->hash);
ret = ctx->hash;
break;
#endif
! #ifdef GC_USE_MD5
case GC_MD5:
md5_finish_ctx (&ctx->md5Context, ctx->hash);
ret = ctx->hash;
break;
#endif
! #ifdef GC_USE_SHA1
case GC_SHA1:
sha1_finish_ctx (&ctx->sha1Context, ctx->hash);
ret = ctx->hash;
--- 722,749 ----
switch (ctx->alg)
{
! #ifdef GNULIB_GC_MD2
case GC_MD2:
md2_finish_ctx (&ctx->md2Context, ctx->hash);
ret = ctx->hash;
break;
#endif
! #ifdef GNULIB_GC_MD4
case GC_MD4:
md4_finish_ctx (&ctx->md4Context, ctx->hash);
ret = ctx->hash;
break;
#endif
! #ifdef GNULIB_GC_MD5
case GC_MD5:
md5_finish_ctx (&ctx->md5Context, ctx->hash);
ret = ctx->hash;
break;
#endif
! #ifdef GNULIB_GC_SHA1
case GC_SHA1:
sha1_finish_ctx (&ctx->sha1Context, ctx->hash);
ret = ctx->hash;
***************
*** 770,794 ****
{
switch (hash)
{
! #ifdef GC_USE_MD2
case GC_MD2:
md2_buffer (in, inlen, resbuf);
break;
#endif
! #ifdef GC_USE_MD4
case GC_MD4:
md4_buffer (in, inlen, resbuf);
break;
#endif
! #ifdef GC_USE_MD5
case GC_MD5:
md5_buffer (in, inlen, resbuf);
break;
#endif
! #ifdef GC_USE_SHA1
case GC_SHA1:
sha1_buffer (in, inlen, resbuf);
break;
--- 770,794 ----
{
switch (hash)
{
! #ifdef GNULIB_GC_MD2
case GC_MD2:
md2_buffer (in, inlen, resbuf);
break;
#endif
! #ifdef GNULIB_GC_MD4
case GC_MD4:
md4_buffer (in, inlen, resbuf);
break;
#endif
! #ifdef GNULIB_GC_MD5
case GC_MD5:
md5_buffer (in, inlen, resbuf);
break;
#endif
! #ifdef GNULIB_GC_SHA1
case GC_SHA1:
sha1_buffer (in, inlen, resbuf);
break;
***************
*** 801,807 ****
return GC_OK;
}
! #ifdef GC_USE_MD2
Gc_rc
gc_md2 (const void *in, size_t inlen, void *resbuf)
{
--- 801,807 ----
return GC_OK;
}
! #ifdef GNULIB_GC_MD2
Gc_rc
gc_md2 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 810,816 ****
}
#endif
! #ifdef GC_USE_MD4
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
--- 810,816 ----
}
#endif
! #ifdef GNULIB_GC_MD4
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 819,825 ****
}
#endif
! #ifdef GC_USE_MD5
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
--- 819,825 ----
}
#endif
! #ifdef GNULIB_GC_MD5
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 828,834 ****
}
#endif
! #ifdef GC_USE_SHA1
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
--- 828,834 ----
}
#endif
! #ifdef GNULIB_GC_SHA1
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 837,843 ****
}
#endif
! #ifdef GC_USE_HMAC_MD5
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
--- 837,843 ----
}
#endif
! #ifdef GNULIB_GC_HMAC_MD5
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
***************
*** 847,853 ****
}
#endif
! #ifdef GC_USE_HMAC_SHA1
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
--- 847,853 ----
}
#endif
! #ifdef GNULIB_GC_HMAC_SHA1
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
diff -c -3 -r1.16 gc-libgcrypt.c
*** lib/gc-libgcrypt.c 29 Oct 2006 21:52:55 -0000 1.16
--- lib/gc-libgcrypt.c 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
/* gc-libgcrypt.c --- Crypto wrappers around Libgcrypt for GC.
! * Copyright (C) 2002, 2003, 2004, 2005, 2006 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
--- 1,5 ----
/* gc-libgcrypt.c --- Crypto wrappers around Libgcrypt for GC.
! * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
***************
*** 30,36 ****
/* Get libgcrypt API. */
#include <gcrypt.h>
! #ifdef GC_USE_MD2
# include "md2.h"
#endif
--- 30,36 ----
/* Get libgcrypt API. */
#include <gcrypt.h>
! #ifdef GNULIB_GC_MD2
# include "md2.h"
#endif
***************
*** 63,69 ****
return;
}
! #ifdef GC_USE_RANDOM
/* Randomness. */
--- 63,69 ----
return;
}
! #ifdef GNULIB_GC_RANDOM
/* Randomness. */
***************
*** 230,236 ****
Gc_hash alg;
Gc_hash_mode mode;
gcry_md_hd_t gch;
! #ifdef GC_USE_MD2
char hash[GC_MD2_DIGEST_SIZE];
struct md2_ctx md2Context;
#endif
--- 230,236 ----
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
***************
*** 367,373 ****
gc_hash_hmac_setkey (gc_hash_handle handle, size_t len, const char *key)
{
_gc_hash_ctx *ctx = handle;
! #ifdef GC_USE_MD2
if (ctx->alg != GC_MD2)
#endif
gcry_md_setkey (ctx->gch, key, len);
--- 367,373 ----
gc_hash_hmac_setkey (gc_hash_handle handle, size_t len, const char *key)
{
_gc_hash_ctx *ctx = handle;
! #ifdef GNULIB_GC_MD2
if (ctx->alg != GC_MD2)
#endif
gcry_md_setkey (ctx->gch, key, len);
***************
*** 378,384 ****
{
_gc_hash_ctx *ctx = handle;
! #ifdef GC_USE_MD2
if (ctx->alg == GC_MD2)
md2_process_bytes (data, len, &ctx->md2Context);
else
--- 378,384 ----
{
_gc_hash_ctx *ctx = handle;
! #ifdef GNULIB_GC_MD2
if (ctx->alg == GC_MD2)
md2_process_bytes (data, len, &ctx->md2Context);
else
***************
*** 392,398 ****
_gc_hash_ctx *ctx = handle;
const char *digest;
! #ifdef GC_USE_MD2
if (ctx->alg == GC_MD2)
{
md2_finish_ctx (&ctx->md2Context, ctx->hash);
--- 392,398 ----
_gc_hash_ctx *ctx = handle;
const char *digest;
! #ifdef GNULIB_GC_MD2
if (ctx->alg == GC_MD2)
{
md2_finish_ctx (&ctx->md2Context, ctx->hash);
***************
*** 413,419 ****
{
_gc_hash_ctx *ctx = handle;
! #ifdef GC_USE_MD2
if (ctx->alg != GC_MD2)
#endif
gcry_md_close (ctx->gch);
--- 413,419 ----
{
_gc_hash_ctx *ctx = handle;
! #ifdef GNULIB_GC_MD2
if (ctx->alg != GC_MD2)
#endif
gcry_md_close (ctx->gch);
***************
*** 428,459 ****
switch (hash)
{
! #ifdef GC_USE_MD2
case GC_MD2:
md2_buffer (in, inlen, resbuf);
return GC_OK;
break;
#endif
! #ifdef GC_USE_MD4
case GC_MD4:
gcryalg = GCRY_MD_MD4;
break;
#endif
! #ifdef GC_USE_MD5
case GC_MD5:
gcryalg = GCRY_MD_MD5;
break;
#endif
! #ifdef GC_USE_SHA1
case GC_SHA1:
gcryalg = GCRY_MD_SHA1;
break;
#endif
! #ifdef GC_USE_RMD160
case GC_RMD160:
gcryalg = GCRY_MD_RMD160;
break;
--- 428,459 ----
switch (hash)
{
! #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
! #ifdef GNULIB_GC_MD5
case GC_MD5:
gcryalg = GCRY_MD_MD5;
break;
#endif
! #ifdef GNULIB_GC_SHA1
case GC_SHA1:
gcryalg = GCRY_MD_SHA1;
break;
#endif
! #ifdef GNULIB_GC_RMD160
case GC_RMD160:
gcryalg = GCRY_MD_RMD160;
break;
***************
*** 470,476 ****
/* One-call interface. */
! #ifdef GC_USE_MD2
Gc_rc
gc_md2 (const void *in, size_t inlen, void *resbuf)
{
--- 470,476 ----
/* One-call interface. */
! #ifdef GNULIB_GC_MD2
Gc_rc
gc_md2 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 479,485 ****
}
#endif
! #ifdef GC_USE_MD4
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
--- 479,485 ----
}
#endif
! #ifdef GNULIB_GC_MD4
Gc_rc
gc_md4 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 511,517 ****
}
#endif
! #ifdef GC_USE_MD5
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
--- 511,517 ----
}
#endif
! #ifdef GNULIB_GC_MD5
Gc_rc
gc_md5 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 543,549 ****
}
#endif
! #ifdef GC_USE_SHA1
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
--- 543,549 ----
}
#endif
! #ifdef GNULIB_GC_SHA1
Gc_rc
gc_sha1 (const void *in, size_t inlen, void *resbuf)
{
***************
*** 575,581 ****
}
#endif
! #ifdef GC_USE_HMAC_MD5
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
--- 575,581 ----
}
#endif
! #ifdef GNULIB_GC_HMAC_MD5
Gc_rc
gc_hmac_md5 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
***************
*** 615,621 ****
}
#endif
! #ifdef GC_USE_HMAC_SHA1
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
--- 615,621 ----
}
#endif
! #ifdef GNULIB_GC_HMAC_SHA1
Gc_rc
gc_hmac_sha1 (const void *key, size_t keylen,
const void *in, size_t inlen, char *resbuf)
diff -c -3 -r1.1 gc-arcfour.m4
*** m4/gc-arcfour.m4 19 Oct 2005 15:40:27 -0000 1.1
--- m4/gc-arcfour.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-arcfour.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-arcfour.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,14 ****
AC_DEFUN([gl_GC_ARCFOUR],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_ARCFOUR, 1,
- [Define if you want to support ARCFOUR through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_ARCFOUR
fi
--- 7,12 ----
diff -c -3 -r1.1 gc-arctwo.m4
*** m4/gc-arctwo.m4 21 Oct 2005 12:03:18 -0000 1.1
--- m4/gc-arctwo.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-arctwo.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-arctwo.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,14 ****
AC_DEFUN([gl_GC_ARCTWO],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_ARCTWO, 1,
- [Define if you want to support ARCTWO through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_ARCTWO
fi
--- 7,12 ----
diff -c -3 -r1.1 gc-des.m4
*** m4/gc-des.m4 21 Oct 2005 12:28:18 -0000 1.1
--- m4/gc-des.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-des.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-des.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,13 ****
AC_DEFUN([gl_GC_DES],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_DES, 1, [Define if you want to support DES through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_DES
fi
--- 7,12 ----
diff -c -3 -r1.2 gc-hmac-md5.m4
*** m4/gc-hmac-md5.m4 19 Oct 2005 08:37:44 -0000 1.2
--- m4/gc-hmac-md5.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-hmac-md5.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-hmac-md5.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,14 ****
AC_DEFUN([gl_GC_HMAC_MD5],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_HMAC_MD5, 1,
- [Define if you want to support HMAC-MD5 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_MD5
gl_HMAC_MD5
--- 7,12 ----
diff -c -3 -r1.2 gc-hmac-sha1.m4
*** m4/gc-hmac-sha1.m4 19 Oct 2005 08:37:44 -0000 1.2
--- m4/gc-hmac-sha1.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-hmac-sha1.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-hmac-sha1.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,14 ****
AC_DEFUN([gl_GC_HMAC_SHA1],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_HMAC_SHA1, 1,
- [Define if you want to support HMAC-SHA1 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_SHA1
gl_HMAC_SHA1
--- 7,12 ----
diff -c -3 -r1.1 gc-md2.m4
*** m4/gc-md2.m4 28 Oct 2005 12:09:33 -0000 1.1
--- m4/gc-md2.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,10 ****
! # gc-md2.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_GC_MD2],
[
- AC_DEFINE(GC_USE_MD2, 1, [Define if you want to support MD2 through GC.])
])
--- 1,9 ----
! # gc-md2.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_GC_MD2],
[
])
diff -c -3 -r1.2 gc-md4.m4
*** m4/gc-md4.m4 19 Oct 2005 08:37:43 -0000 1.2
--- m4/gc-md4.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-md4.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-md4.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,13 ****
AC_DEFUN([gl_GC_MD4],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_MD4, 1, [Define if you want to support MD4 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_MD4
fi
--- 7,12 ----
diff -c -3 -r1.2 gc-md5.m4
*** m4/gc-md5.m4 19 Oct 2005 08:37:43 -0000 1.2
--- m4/gc-md5.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-md5.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-md5.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,13 ****
AC_DEFUN([gl_GC_MD5],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_MD5, 1, [Define if you want to support MD5 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_MD5
fi
--- 7,12 ----
diff -c -3 -r1.4 gc-random.m4
*** m4/gc-random.m4 8 Mar 2006 16:09:45 -0000 1.4
--- m4/gc-random.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-random.m4 serial 1
! dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-random.m4 serial 2
! dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 84,89 ****
[defined to the name of the pseudo random device])
AC_DEFINE_UNQUOTED(NAME_OF_NONCE_DEVICE, "$NAME_OF_NONCE_DEVICE",
[defined to the name of the unpredictable nonce device])
-
- AC_DEFINE(GC_USE_RANDOM, 1, [Define if you want to support RNG through GC.])
])
--- 84,87 ----
diff -c -3 -r1.1 gc-rijndael.m4
*** m4/gc-rijndael.m4 19 Oct 2005 14:54:32 -0000 1.1
--- m4/gc-rijndael.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-rijndael.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-rijndael.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,14 ****
AC_DEFUN([gl_GC_RIJNDAEL],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_RIJNDAEL, 1,
- [Define if you want to support RIJNDAEL through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_RIJNDAEL
fi
--- 7,12 ----
diff -c -3 -r1.2 gc-sha1.m4
*** m4/gc-sha1.m4 19 Oct 2005 08:37:43 -0000 1.2
--- m4/gc-sha1.m4 8 Jan 2007 19:50:20 -0000
***************
*** 1,5 ****
! # gc-sha1.m4 serial 1
! dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # gc-sha1.m4 serial 2
! dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
***************
*** 7,14 ****
AC_DEFUN([gl_GC_SHA1],
[
AC_REQUIRE([gl_GC])
- AC_DEFINE(GC_USE_SHA1, 1,
- [Define if you want to support SHA-1 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_SHA1
fi
--- 7,12 ----
diff -c -3 -r1.3 gc-arcfour
*** modules/gc-arcfour 13 Oct 2006 12:40:23 -0000 1.3
--- modules/gc-arcfour 8 Jan 2007 19:50:20 -0000
***************
*** 13,18 ****
--- 13,19 ----
configure.ac:
gl_GC_ARCFOUR
+ gl_MODULE_INDICATOR([gc-arcfour])
Makefile.am:
diff -c -3 -r1.1 gc-arctwo
*** modules/gc-arctwo 21 Oct 2005 12:03:17 -0000 1.1
--- modules/gc-arctwo 8 Jan 2007 19:50:20 -0000
***************
*** 13,18 ****
--- 13,19 ----
configure.ac:
gl_GC_ARCTWO
+ gl_MODULE_INDICATOR([gc-arctwo])
Makefile.am:
diff -c -3 -r1.3 gc-des
*** modules/gc-des 13 Oct 2006 12:40:23 -0000 1.3
--- modules/gc-des 8 Jan 2007 19:50:20 -0000
***************
*** 13,18 ****
--- 13,19 ----
configure.ac:
gl_GC_DES
+ gl_MODULE_INDICATOR([gc-des])
Makefile.am:
diff -c -3 -r1.3 gc-hmac-md5
*** modules/gc-hmac-md5 13 Oct 2006 12:40:23 -0000 1.3
--- modules/gc-hmac-md5 8 Jan 2007 19:50:20 -0000
***************
*** 19,24 ****
--- 19,25 ----
configure.ac:
gl_GC_HMAC_MD5
+ gl_MODULE_INDICATOR([gc-hmac-md5])
Makefile.am:
diff -c -3 -r1.4 gc-hmac-sha1
*** modules/gc-hmac-sha1 13 Oct 2006 12:40:23 -0000 1.4
--- modules/gc-hmac-sha1 8 Jan 2007 19:50:20 -0000
***************
*** 19,24 ****
--- 19,25 ----
configure.ac:
gl_GC_HMAC_SHA1
+ gl_MODULE_INDICATOR([gc-hmac-sha1])
Makefile.am:
diff -c -3 -r1.1 gc-md2
*** modules/gc-md2 28 Oct 2005 12:09:32 -0000 1.1
--- modules/gc-md2 8 Jan 2007 19:50:20 -0000
***************
*** 12,17 ****
--- 12,18 ----
configure.ac:
gl_GC_MD2
+ gl_MODULE_INDICATOR([gc-md2])
Makefile.am:
diff -c -3 -r1.3 gc-md4
*** modules/gc-md4 13 Oct 2006 12:40:23 -0000 1.3
--- modules/gc-md4 8 Jan 2007 19:50:20 -0000
***************
*** 13,18 ****
--- 13,19 ----
configure.ac:
gl_GC_MD4
+ gl_MODULE_INDICATOR([gc-md4])
Makefile.am:
diff -c -3 -r1.2 gc-md5
*** modules/gc-md5 22 Aug 2006 10:22:52 -0000 1.2
--- modules/gc-md5 8 Jan 2007 19:50:20 -0000
***************
*** 13,18 ****
--- 13,19 ----
configure.ac:
gl_GC_MD5
+ gl_MODULE_INDICATOR([gc-md5])
Makefile.am:
lib_SOURCES += md5.h
diff -c -3 -r1.1 gc-random
*** modules/gc-random 7 Mar 2006 13:17:10 -0000 1.1
--- modules/gc-random 8 Jan 2007 19:50:20 -0000
***************
*** 9,14 ****
--- 9,15 ----
configure.ac:
gl_GC_RANDOM
+ gl_MODULE_INDICATOR([gc-random])
Makefile.am:
diff -c -3 -r1.1 gc-rijndael
*** modules/gc-rijndael 19 Oct 2005 14:54:33 -0000 1.1
--- modules/gc-rijndael 8 Jan 2007 19:50:20 -0000
***************
*** 15,20 ****
--- 15,21 ----
configure.ac:
gl_GC_RIJNDAEL
+ gl_MODULE_INDICATOR([gc-rijndael])
Makefile.am:
diff -c -3 -r1.3 gc-sha1
*** modules/gc-sha1 13 Oct 2006 12:40:23 -0000 1.3
--- modules/gc-sha1 8 Jan 2007 19:50:20 -0000
***************
*** 13,18 ****
--- 13,19 ----
configure.ac:
gl_GC_SHA1
+ gl_MODULE_INDICATOR([gc-sha1])
Makefile.am: