From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 572481F461 for ; Sat, 24 Aug 2019 11:33:35 +0000 (UTC) Received: from localhost ([::1]:37062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1UIX-0005CX-Uv for normalperson@yhbt.net; Sat, 24 Aug 2019 07:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60152) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1UIR-0005BH-Gy for bug-gnulib@gnu.org; Sat, 24 Aug 2019 07:33:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1UIP-0001pB-CG for bug-gnulib@gnu.org; Sat, 24 Aug 2019 07:33:27 -0400 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::11]:16388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i1UIO-0001nk-Jk for bug-gnulib@gnu.org; Sat, 24 Aug 2019 07:33:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1566646402; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=TbqruUXeUZiEtrltGmCVEuYdIKn6IpJapyVrCgYiH/E=; b=Sj96AqokfrmqtL7F+DlgQl1S8htZP/TR78fzIAKfc6943ss0gqWaqPvFK45fswy5mr 64H0H/rorRnFAs5mvpGgyTeWZgXLYV/xOGNvbEClsRn8WqjIzGJb6021QijOUkLaFKIu qMRFgtOxr1c7CKk07/52onr+DayGbJ+F4drbhbRPNYnZ8ksTnpdYpVIiWenIclj8fjHD qnw6WCnI9X9FgLvCrjn8BbgRSXtTRDovzvZfwCzuGSXGg7XZcMZo7o8Fu+anUAjxTov5 Q7FAjyZx16uhVfUQWWbutvDLydr7C/ClrbM87GPgkjaGY7fS6sT2GzGlEumnhOIsDZcs 1xZw== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOGaf0zJZW" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 44.26.1 DYNA|AUTH) with ESMTPSA id 507e7dv7OBXLH4Y (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Sat, 24 Aug 2019 13:33:21 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org Subject: crypto/gc: access the module indicators correctly Date: Sat, 24 Aug 2019 13:33:20 +0200 Message-ID: <2912279.N7M3OgNu2S@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-157-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:238:20a:202:5300::11 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" The C macros defined by gl_MODULE_INDICATOR expand to expressions that evaluate to 0 or 1. They don't always evaluate to 1. (Namely, when a module is needed by tests only.) Therefore it is wrong to test them with '#ifdef'. 2019-08-24 Bruno Haible crypto/gc: Access the module indicators correctly. * lib/gc-gnulib.c: Use '#if GNULIB_GC_*', not '#ifdef GNULIB_GC_*'. * lib/gc-libgcrypt.c: Likewise. diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c index 6eb9618..62aa50a 100644 --- a/lib/gc-gnulib.c +++ b/lib/gc-gnulib.c @@ -27,7 +27,7 @@ #include /* For randomize. */ -#ifdef GNULIB_GC_RANDOM +#if GNULIB_GC_RANDOM # include # include # include @@ -36,40 +36,40 @@ #endif /* Hashes. */ -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 # include "md2.h" #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 # include "md4.h" #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 # include "md5.h" #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 # include "sha1.h" #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 # include "sm3.h" #endif -#if defined(GNULIB_GC_HMAC_MD5) || defined(GNULIB_GC_HMAC_SHA1) || defined(GNULIB_GC_HMAC_SHA256) || defined(GNULIB_GC_HMAC_SHA512) +#if GNULIB_GC_HMAC_MD5 || GNULIB_GC_HMAC_SHA1 || GNULIB_GC_HMAC_SHA256 || GNULIB_GC_HMAC_SHA512 # include "hmac.h" #endif /* Ciphers. */ -#ifdef GNULIB_GC_ARCFOUR +#if GNULIB_GC_ARCFOUR # include "arcfour.h" #endif -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO # include "arctwo.h" #endif -#ifdef GNULIB_GC_DES +#if GNULIB_GC_DES # include "des.h" #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL # include "rijndael-api-fst.h" #endif -#ifdef GNULIB_GC_RANDOM +#if GNULIB_GC_RANDOM # if defined _WIN32 && ! defined __CYGWIN__ # include # include @@ -86,7 +86,7 @@ HCRYPTPROV g_hProv = 0; Gc_rc gc_init (void) { -#ifdef GNULIB_GC_RANDOM +#if GNULIB_GC_RANDOM # if defined _WIN32 && ! defined __CYGWIN__ if (g_hProv) CryptReleaseContext (g_hProv, 0); @@ -113,7 +113,7 @@ gc_init (void) void gc_done (void) { -#ifdef GNULIB_GC_RANDOM +#if GNULIB_GC_RANDOM # if defined _WIN32 && ! defined __CYGWIN__ if (g_hProv) { @@ -126,7 +126,7 @@ gc_done (void) return; } -#ifdef GNULIB_GC_RANDOM +#if GNULIB_GC_RANDOM /* Randomness. */ @@ -228,17 +228,17 @@ typedef struct _gc_cipher_ctx { Gc_cipher alg; Gc_cipher_mode mode; -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO arctwo_context arctwoContext; char arctwoIV[ARCTWO_BLOCK_SIZE]; #endif -#ifdef GNULIB_GC_ARCFOUR +#if GNULIB_GC_ARCFOUR arcfour_context arcfourContext; #endif -#ifdef GNULIB_GC_DES +#if GNULIB_GC_DES gl_des_ctx desContext; #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL rijndaelKeyInstance aesEncKey; rijndaelKeyInstance aesDecKey; rijndaelCipherInstance aesContext; @@ -261,7 +261,7 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode, switch (alg) { -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO case GC_ARCTWO40: switch (mode) { @@ -275,7 +275,7 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode, break; #endif -#ifdef GNULIB_GC_ARCFOUR +#if GNULIB_GC_ARCFOUR case GC_ARCFOUR128: case GC_ARCFOUR40: switch (mode) @@ -289,7 +289,7 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode, break; #endif -#ifdef GNULIB_GC_DES +#if GNULIB_GC_DES case GC_DES: switch (mode) { @@ -302,7 +302,7 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode, break; #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL case GC_AES128: case GC_AES192: case GC_AES256: @@ -337,20 +337,20 @@ gc_cipher_setkey (gc_cipher_handle handle, size_t keylen, const char *key) switch (ctx->alg) { -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO case GC_ARCTWO40: arctwo_setkey (&ctx->arctwoContext, keylen, key); break; #endif -#ifdef GNULIB_GC_ARCFOUR +#if GNULIB_GC_ARCFOUR case GC_ARCFOUR128: case GC_ARCFOUR40: arcfour_setkey (&ctx->arcfourContext, key, keylen); break; #endif -#ifdef GNULIB_GC_DES +#if GNULIB_GC_DES case GC_DES: if (keylen != 8) return GC_INVALID_CIPHER; @@ -358,7 +358,7 @@ gc_cipher_setkey (gc_cipher_handle handle, size_t keylen, const char *key) break; #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL case GC_AES128: case GC_AES192: case GC_AES256: @@ -401,7 +401,7 @@ gc_cipher_setiv (gc_cipher_handle handle, size_t ivlen, const char *iv) switch (ctx->alg) { -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO case GC_ARCTWO40: if (ivlen != ARCTWO_BLOCK_SIZE) return GC_INVALID_CIPHER; @@ -409,7 +409,7 @@ gc_cipher_setiv (gc_cipher_handle handle, size_t ivlen, const char *iv) break; #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL case GC_AES128: case GC_AES192: case GC_AES256: @@ -455,7 +455,7 @@ gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data) switch (ctx->alg) { -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO case GC_ARCTWO40: switch (ctx->mode) { @@ -482,21 +482,21 @@ gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data) break; #endif -#ifdef GNULIB_GC_ARCFOUR +#if GNULIB_GC_ARCFOUR case GC_ARCFOUR128: case GC_ARCFOUR40: arcfour_stream (&ctx->arcfourContext, data, data, len); break; #endif -#ifdef GNULIB_GC_DES +#if GNULIB_GC_DES case GC_DES: for (; len >= 8; len -= 8, data += 8) gl_des_ecb_encrypt (&ctx->desContext, data, data); break; #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL case GC_AES128: case GC_AES192: case GC_AES256: @@ -525,7 +525,7 @@ gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data) switch (ctx->alg) { -#ifdef GNULIB_GC_ARCTWO +#if GNULIB_GC_ARCTWO case GC_ARCTWO40: switch (ctx->mode) { @@ -554,21 +554,21 @@ gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data) break; #endif -#ifdef GNULIB_GC_ARCFOUR +#if GNULIB_GC_ARCFOUR case GC_ARCFOUR128: case GC_ARCFOUR40: arcfour_stream (&ctx->arcfourContext, data, data, len); break; #endif -#ifdef GNULIB_GC_DES +#if GNULIB_GC_DES case GC_DES: for (; len >= 8; len -= 8, data += 8) gl_des_ecb_decrypt (&ctx->desContext, data, data); break; #endif -#ifdef GNULIB_GC_RIJNDAEL +#if GNULIB_GC_RIJNDAEL case GC_AES128: case GC_AES192: case GC_AES256: @@ -609,19 +609,19 @@ typedef struct _gc_hash_ctx Gc_hash alg; Gc_hash_mode mode; char hash[MAX_DIGEST_SIZE]; -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 struct md2_ctx md2Context; #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 struct md4_ctx md4Context; #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 struct md5_ctx md5Context; #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 struct sha1_ctx sha1Context; #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 struct sm3_ctx sm3Context; #endif } _gc_hash_ctx; @@ -644,31 +644,31 @@ gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle) switch (hash) { -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 case GC_MD2: md2_init_ctx (&ctx->md2Context); break; #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 case GC_MD4: md4_init_ctx (&ctx->md4Context); break; #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 case GC_MD5: md5_init_ctx (&ctx->md5Context); break; #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 case GC_SHA1: sha1_init_ctx (&ctx->sha1Context); break; #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 case GC_SM3: sm3_init_ctx (&ctx->sm3Context); break; @@ -747,31 +747,31 @@ gc_hash_write (gc_hash_handle handle, size_t len, const char *data) switch (ctx->alg) { -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 case GC_MD2: md2_process_bytes (data, len, &ctx->md2Context); break; #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 case GC_MD4: md4_process_bytes (data, len, &ctx->md4Context); break; #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 case GC_MD5: md5_process_bytes (data, len, &ctx->md5Context); break; #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 case GC_SHA1: sha1_process_bytes (data, len, &ctx->sha1Context); break; #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 case GC_SM3: sm3_process_bytes (data, len, &ctx->sm3Context); break; @@ -790,35 +790,35 @@ gc_hash_read (gc_hash_handle handle) switch (ctx->alg) { -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 case GC_MD2: md2_finish_ctx (&ctx->md2Context, ctx->hash); ret = ctx->hash; break; #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 case GC_MD4: md4_finish_ctx (&ctx->md4Context, ctx->hash); ret = ctx->hash; break; #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 case GC_MD5: md5_finish_ctx (&ctx->md5Context, ctx->hash); ret = ctx->hash; break; #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 case GC_SHA1: sha1_finish_ctx (&ctx->sha1Context, ctx->hash); ret = ctx->hash; break; #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 case GC_SM3: sm3_finish_ctx (&ctx->sm3Context, ctx->hash); ret = ctx->hash; @@ -845,31 +845,31 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf) { switch (hash) { -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 case GC_MD2: md2_buffer (in, inlen, resbuf); break; #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 case GC_MD4: md4_buffer (in, inlen, resbuf); break; #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 case GC_MD5: md5_buffer (in, inlen, resbuf); break; #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 case GC_SHA1: sha1_buffer (in, inlen, resbuf); break; #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 case GC_SM3: sm3_buffer (in, inlen, resbuf); break; @@ -882,7 +882,7 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf) return GC_OK; } -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 Gc_rc gc_md2 (const void *in, size_t inlen, void *resbuf) { @@ -891,7 +891,7 @@ gc_md2 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 Gc_rc gc_md4 (const void *in, size_t inlen, void *resbuf) { @@ -900,7 +900,7 @@ gc_md4 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 Gc_rc gc_md5 (const void *in, size_t inlen, void *resbuf) { @@ -909,7 +909,7 @@ gc_md5 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 Gc_rc gc_sha1 (const void *in, size_t inlen, void *resbuf) { @@ -918,7 +918,7 @@ gc_sha1 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 Gc_rc gc_sm3 (const void *in, size_t inlen, void *resbuf) { @@ -927,7 +927,7 @@ gc_sm3 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_HMAC_MD5 +#if GNULIB_GC_HMAC_MD5 Gc_rc gc_hmac_md5 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) @@ -937,7 +937,7 @@ gc_hmac_md5 (const void *key, size_t keylen, } #endif -#ifdef GNULIB_GC_HMAC_SHA1 +#if GNULIB_GC_HMAC_SHA1 Gc_rc gc_hmac_sha1 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) @@ -947,7 +947,7 @@ gc_hmac_sha1 (const void *key, size_t keylen, } #endif -#ifdef GNULIB_GC_HMAC_SHA256 +#if GNULIB_GC_HMAC_SHA256 Gc_rc gc_hmac_sha256 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) @@ -957,7 +957,7 @@ gc_hmac_sha256 (const void *key, size_t keylen, } #endif -#ifdef GNULIB_GC_HMAC_SHA512 +#if GNULIB_GC_HMAC_SHA512 Gc_rc gc_hmac_sha512 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) diff --git a/lib/gc-libgcrypt.c b/lib/gc-libgcrypt.c index 4683566..f92fabc 100644 --- a/lib/gc-libgcrypt.c +++ b/lib/gc-libgcrypt.c @@ -28,7 +28,7 @@ /* Get libgcrypt API. */ #include -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 # include "md2.h" #endif @@ -68,7 +68,7 @@ gc_done (void) return; } -#ifdef GNULIB_GC_RANDOM +#if GNULIB_GC_RANDOM /* Randomness. */ @@ -245,7 +245,7 @@ typedef struct _gc_hash_ctx { Gc_hash alg; Gc_hash_mode mode; gcry_md_hd_t gch; -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 char hash[GC_MD2_DIGEST_SIZE]; struct md2_ctx md2Context; #endif @@ -304,7 +304,7 @@ gc_hash_open (Gc_hash hash, Gc_hash_mode mode, gc_hash_handle * outhandle) gcryalg = GCRY_MD_RMD160; break; -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 case GC_SM3: gcryalg = GCRY_MD_SM3; break; @@ -424,7 +424,7 @@ void gc_hash_hmac_setkey (gc_hash_handle handle, size_t len, const char *key) { _gc_hash_ctx *ctx = handle; -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 if (ctx->alg != GC_MD2) #endif gcry_md_setkey (ctx->gch, key, len); @@ -435,7 +435,7 @@ gc_hash_write (gc_hash_handle handle, size_t len, const char *data) { _gc_hash_ctx *ctx = handle; -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 if (ctx->alg == GC_MD2) md2_process_bytes (data, len, &ctx->md2Context); else @@ -449,7 +449,7 @@ gc_hash_read (gc_hash_handle handle) _gc_hash_ctx *ctx = handle; const char *digest; -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 if (ctx->alg == GC_MD2) { md2_finish_ctx (&ctx->md2Context, ctx->hash); @@ -470,7 +470,7 @@ gc_hash_close (gc_hash_handle handle) { _gc_hash_ctx *ctx = handle; -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 if (ctx->alg != GC_MD2) #endif gcry_md_close (ctx->gch); @@ -485,62 +485,62 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf) switch (hash) { -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 case GC_MD2: md2_buffer (in, inlen, resbuf); return GC_OK; break; #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 case GC_MD4: gcryalg = GCRY_MD_MD4; break; #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 case GC_MD5: gcryalg = GCRY_MD_MD5; break; #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 case GC_SHA1: gcryalg = GCRY_MD_SHA1; break; #endif -#ifdef GNULIB_GC_SHA256 +#if GNULIB_GC_SHA256 case GC_SHA256: gcryalg = GCRY_MD_SHA256; break; #endif -#ifdef GNULIB_GC_SHA384 +#if GNULIB_GC_SHA384 case GC_SHA384: gcryalg = GCRY_MD_SHA384; break; #endif -#ifdef GNULIB_GC_SHA512 +#if GNULIB_GC_SHA512 case GC_SHA512: gcryalg = GCRY_MD_SHA512; break; #endif -#ifdef GNULIB_GC_SHA224 +#if GNULIB_GC_SHA224 case GC_SHA224: gcryalg = GCRY_MD_SHA224; break; #endif -#ifdef GNULIB_GC_RMD160 +#if GNULIB_GC_RMD160 case GC_RMD160: gcryalg = GCRY_MD_RMD160; break; #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 case GC_SM3: gcryalg = GCRY_MD_SM3; break; @@ -557,7 +557,7 @@ gc_hash_buffer (Gc_hash hash, const void *in, size_t inlen, char *resbuf) /* One-call interface. */ -#ifdef GNULIB_GC_MD2 +#if GNULIB_GC_MD2 Gc_rc gc_md2 (const void *in, size_t inlen, void *resbuf) { @@ -566,7 +566,7 @@ gc_md2 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_MD4 +#if GNULIB_GC_MD4 Gc_rc gc_md4 (const void *in, size_t inlen, void *resbuf) { @@ -598,7 +598,7 @@ gc_md4 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_MD5 +#if GNULIB_GC_MD5 Gc_rc gc_md5 (const void *in, size_t inlen, void *resbuf) { @@ -630,7 +630,7 @@ gc_md5 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_SHA1 +#if GNULIB_GC_SHA1 Gc_rc gc_sha1 (const void *in, size_t inlen, void *resbuf) { @@ -662,7 +662,7 @@ gc_sha1 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_SM3 +#if GNULIB_GC_SM3 Gc_rc gc_sm3 (const void *in, size_t inlen, void *resbuf) { @@ -694,7 +694,7 @@ gc_sm3 (const void *in, size_t inlen, void *resbuf) } #endif -#ifdef GNULIB_GC_HMAC_MD5 +#if GNULIB_GC_HMAC_MD5 Gc_rc gc_hmac_md5 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) @@ -734,7 +734,7 @@ gc_hmac_md5 (const void *key, size_t keylen, } #endif -#ifdef GNULIB_GC_HMAC_SHA1 +#if GNULIB_GC_HMAC_SHA1 Gc_rc gc_hmac_sha1 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) @@ -774,7 +774,7 @@ gc_hmac_sha1 (const void *key, size_t keylen, } #endif -#ifdef GNULIB_GC_HMAC_SHA256 +#if GNULIB_GC_HMAC_SHA256 Gc_rc gc_hmac_sha256 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf) @@ -814,7 +814,7 @@ gc_hmac_sha256 (const void *key, size_t keylen, } #endif -#ifdef GNULIB_GC_HMAC_SHA512 +#if GNULIB_GC_HMAC_SHA512 Gc_rc gc_hmac_sha512 (const void *key, size_t keylen, const void *in, size_t inlen, char *resbuf)