+2019-08-24 Bruno Haible <bruno@clisp.org>
+
+ crypto/gc-sm3: Fix compilation error with --with-libgcrypt.
+ * m4/gc-sm3.m4 (gl_GC_SM3): Test whether libgcrypt supports SM3. Define
+ LIBGCRYPT_HAS_MD_SM3.
+ * lib/gc-libgcrypt.c: Include sm3.h.
+ (_gc_hash_ctx, gc_hash_open, gc_hash_hmac_setkey, gc_hash_write,
+ gc_hash_read, gc_hash_close, gc_hash_buffer, gc_sm3): Use the gnulib
+ implementation if libgcrypt does not support SM3.
+
2019-08-24 Bruno Haible <bruno@clisp.org>
crypto/gc-md2: Optimize and clarify code.
MD2 algorithm. Therefore take the implementation from gnulib. */
# include "md2.h"
#endif
+#if GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3
+# include "sm3.h"
+#endif
#include <assert.h>
/* Hashes. */
+/* Maximum of GC_MD2_DIGEST_SIZE and GC_SM3_DIGEST_SIZE. */
+#define MAX_DIGEST_SIZE 32
+
typedef struct _gc_hash_ctx {
Gc_hash alg;
Gc_hash_mode mode;
gcry_md_hd_t gch;
+#if GNULIB_GC_MD2 || (GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3)
+ char hash[MAX_DIGEST_SIZE];
+#endif
#if GNULIB_GC_MD2
- char hash[GC_MD2_DIGEST_SIZE];
struct md2_ctx md2Context;
#endif
+#if GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3
+ struct sm3_ctx sm3Context;
+#endif
} _gc_hash_ctx;
Gc_rc
#if GNULIB_GC_SM3
case GC_SM3:
+# if LIBGCRYPT_HAS_MD_SM3
gcryalg = GCRY_MD_SM3;
+# else
+ sm3_init_ctx (&ctx->sm3Context);
+ gcryalg = GCRY_MD_NONE;
+# endif
break;
#endif
#if GNULIB_GC_MD2
if (ctx->alg != GC_MD2)
#endif
- gcry_md_setkey (ctx->gch, key, len);
+#if GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3
+ if (ctx->alg != GC_SM3)
+#endif
+ gcry_md_setkey (ctx->gch, key, len);
}
void
if (ctx->alg == GC_MD2)
md2_process_bytes (data, len, &ctx->md2Context);
else
+#endif
+#if GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3
+ if (ctx->alg == GC_SM3)
+ sm3_process_bytes (data, len, &ctx->sm3Context);
+ else
#endif
gcry_md_write (ctx->gch, data, len);
}
digest = ctx->hash;
}
else
+#endif
+#if GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3
+ if (ctx->alg == GC_SM3)
+ {
+ sm3_finish_ctx (&ctx->sm3Context, ctx->hash);
+ digest = ctx->hash;
+ }
+ else
#endif
{
gcry_md_final (ctx->gch);
#if GNULIB_GC_MD2
if (ctx->alg != GC_MD2)
#endif
- gcry_md_close (ctx->gch);
+#if GNULIB_GC_SM3 && !LIBGCRYPT_HAS_MD_SM3
+ if (ctx->alg != GC_SM3)
+#endif
+ gcry_md_close (ctx->gch);
free (ctx);
}
case GC_MD2:
md2_buffer (in, inlen, resbuf);
return GC_OK;
- break;
#endif
#if GNULIB_GC_MD4
#if GNULIB_GC_SM3
case GC_SM3:
+# if !LIBGCRYPT_HAS_MD_SM3
+ sm3_buffer (in, inlen, resbuf);
+ return GC_OK;
+# else
gcryalg = GCRY_MD_SM3;
break;
+# endif
#endif
default:
Gc_rc
gc_sm3 (const void *in, size_t inlen, void *resbuf)
{
+# if !LIBGCRYPT_HAS_MD_SM3
+ sm3_buffer (in, inlen, resbuf);
+ return GC_OK;
+# else
size_t outlen = gcry_md_get_algo_dlen (GCRY_MD_SM3);
gcry_md_hd_t hd;
gpg_error_t err;
gcry_md_close (hd);
return GC_OK;
+# endif
}
#endif
-# gc-sm3.m4 serial 1
+# gc-sm3.m4 serial 2
dnl Copyright (C) 2017-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
AC_DEFUN([gl_GC_SM3],
[
AC_REQUIRE([gl_GC])
+ AC_CACHE_CHECK([whether libgcrypt supports SM3],
+ [gl_cv_libcrypt_md_sm3],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+ #include <gcrypt.h>
+ int a = GCRY_MD_SM3;
+ ]], [[]])
+ ],
+ [gl_cv_libcrypt_md_sm3=yes],
+ [gl_cv_libcrypt_md_sm3=no])
+ ])
+ if test $gl_cv_libcrypt_md_sm3 = yes; then
+ AC_DEFINE([LIBGCRYPT_HAS_MD_SM3], [1],
+ [Define if libgcrypt supports the MD algorithm SM3.])
+ fi
])