1.11.2-1

Resolves: #2382944

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -7,3 +7,38 @@ libgcrypt-1.4.5-hobbled.tar.bz2
 /libgcrypt-1.6.1-hobbled.tar.xz
 /libgcrypt-1.6.2-hobbled.tar.xz
 /libgcrypt-1.6.3-hobbled.tar.xz
+/libgcrypt-1.6.4-hobbled.tar.xz
+/libgcrypt-1.6.5-hobbled.tar.xz
+/libgcrypt-1.6.6-hobbled.tar.xz
+/libgcrypt-1.7.3-hobbled.tar.xz
+/libgcrypt-1.7.5-hobbled.tar.xz
+/libgcrypt-1.7.6-hobbled.tar.xz
+/libgcrypt-1.7.7-hobbled.tar.xz
+/libgcrypt-1.7.8-hobbled.tar.xz
+/libgcrypt-1.8.0-hobbled.tar.xz
+/libgcrypt-1.8.1-hobbled.tar.xz
+/libgcrypt-1.8.2-hobbled.tar.xz
+/libgcrypt-1.8.3-hobbled.tar.xz
+/libgcrypt-1.8.4-hobbled.tar.xz
+/libgcrypt-1.8.5-hobbled.tar.xz
+/libgcrypt-1.8.6-hobbled.tar.xz
+/libgcrypt-1.8.7-hobbled.tar.xz
+/libgcrypt-1.9.0-hobbled.tar.xz
+/libgcrypt-1.9.1-hobbled.tar.xz
+/libgcrypt-1.9.2-hobbled.tar.xz
+/libgcrypt-1.9.3-hobbled.tar.xz
+/libgcrypt-1.9.4-hobbled.tar.xz
+/libgcrypt-1.10.0.tar.bz2
+/libgcrypt-1.10.0.tar.bz2.sig
+/libgcrypt-1.10.1.tar.bz2
+/libgcrypt-1.10.1.tar.bz2.sig
+/libgcrypt-1.10.2.tar.bz2
+/libgcrypt-1.10.2.tar.bz2.sig
+/libgcrypt-1.10.3.tar.bz2
+/libgcrypt-1.10.3.tar.bz2.sig
+/libgcrypt-1.11.0.tar.bz2
+/libgcrypt-1.11.0.tar.bz2.sig
+/libgcrypt-1.11.1.tar.bz2
+/libgcrypt-1.11.1.tar.bz2.sig
+/libgcrypt-1.11.2.tar.bz2
+/libgcrypt-1.11.2.tar.bz2.sig

curves.c

@@ -1,166 +0,0 @@
-/* curves.c -  ECC curves regression tests
- *	Copyright (C) 2011 Free Software Foundation, Inc.
- *
- * This file is part of Libgcrypt.
- *
- * Libgcrypt is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * Libgcrypt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "../src/gcrypt-int.h"
-
-/* Number of curves defined in ../cipger/ecc.c */
-#define N_CURVES 4
-
-/* A real world sample public key.  */
-static char const sample_key_1[] =
-"(public-key\n"
-" (ecdsa\n"
-"  (p #00FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF#)\n"
-"  (a #00FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC#)\n"
-"  (b #5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B#)\n"
-"  (g #046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
-        "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5#)\n"
-"  (n #00FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551#)\n"
-"  (q #0442B927242237639A36CE9221B340DB1A9AB76DF2FE3E171277F6A4023DED146EE"
-      "86525E38CCECFF3FB8D152CC6334F70D23A525175C1BCBDDE6E023B2228770E#)\n"
-"  ))";
-static char const sample_key_1_curve[] = "NIST P-256";
-static unsigned int sample_key_1_nbits = 256;
-
-/* Program option flags.  */
-static int verbose;
-static int error_count;
-
-static void
-fail (const char *format, ...)
-{
-  va_list arg_ptr;
-
-  va_start (arg_ptr, format);
-  vfprintf (stderr, format, arg_ptr);
-  va_end (arg_ptr);
-  error_count++;
-}
-
-static void
-die (const char *format, ...)
-{
-  va_list arg_ptr;
-
-  va_start (arg_ptr, format);
-  vfprintf (stderr, format, arg_ptr);
-  va_end (arg_ptr);
-  exit (1);
-}
-
-
-static void
-list_curves (void)
-{
-  int idx;
-  const char *name;
-  unsigned int nbits;
-
-  for (idx=0; (name = gcry_pk_get_curve (NULL, idx, &nbits)); idx++)
-    {
-      if (verbose)
-        printf ("%s - %u bits\n", name, nbits);
-    }
-  if (idx != N_CURVES)
-    fail ("expected %d curves but got %d\n", N_CURVES, idx);
-  if (gcry_pk_get_curve (NULL, -1, NULL))
-    fail ("curve iteration failed\n");
-}
-
-
-static void
-check_matching (void)
-{
-  gpg_error_t err;
-  gcry_sexp_t key;
-  const char *name;
-  unsigned int nbits;
-
-  err = gcry_sexp_new (&key, sample_key_1, 0, 1);
-  if (err)
-    die ("parsing s-expression string failed: %s\n", gpg_strerror (err));
-  name = gcry_pk_get_curve (key, 0, &nbits);
-  if (!name)
-    fail ("curve name not found for sample_key_1\n");
-  else if (strcmp (name, sample_key_1_curve))
-    fail ("expected curve name %s but got %s for sample_key_1\n",
-          sample_key_1_curve, name);
-  else if (nbits != sample_key_1_nbits)
-    fail ("expected curve size %u but got %u for sample_key_1\n",
-          sample_key_1_nbits, nbits);
-
-  gcry_sexp_release (key);
-
-}
-
-
-static void
-check_get_params (void)
-{
-  gcry_sexp_t param;
-  const char *name;
-
-  param = gcry_pk_get_param (GCRY_PK_ECDSA, sample_key_1_curve);
-  if (!param)
-    fail ("error gerring parameters for `%s'\n", sample_key_1_curve);
-
-  name = gcry_pk_get_curve (param, 0, NULL);
-  if (!name)
-    fail ("get_param: curve name not found for sample_key_1\n");
-  else if (strcmp (name, sample_key_1_curve))
-    fail ("get_param: expected curve name %s but got %s for sample_key_1\n",
-          sample_key_1_curve, name);
-
-  gcry_sexp_release (param);
-
-}
-
-
-int
-main (int argc, char **argv)
-{
-  int debug = 0;
-
-  if (argc > 1 && !strcmp (argv[1], "--verbose"))
-    verbose = 1;
-  else if (argc > 1 && !strcmp (argv[1], "--debug"))
-    verbose = debug = 1;
-
-  if (!gcry_check_version (GCRYPT_VERSION))
-    die ("version mismatch\n");
-
-  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-  if (debug)
-    gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u, 0);
-  list_curves ();
-  check_matching ();
-  check_get_params ();
-
-  return error_count ? 1 : 0;
-}

hobble-libgcrypt

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Quit out if anything fails.
-set -e -x
-
-# Clean out patent-or-otherwise-encumbered code.
-# EC:    ????????? ??/??/2015
-
-rm -f cipher/ecc-curves.c
-rm -f tests/curves.c
-rm -f tests/t_mpi_point.c

libgcrypt-1.10.1-annobin.patch

@@ -0,0 +1,22 @@
+diff -rup libgcrypt.orig/src/Makefile.am libgcrypt-1.8.3/src/Makefile.am
+--- libgcrypt.orig/src/Makefile.am	2021-10-18 16:36:20.914025497 +0100
++++ libgcrypt-1.8.3/src/Makefile.am	2021-10-19 12:23:08.652960618 +0100
+@@ -108,6 +108,7 @@ endif !HAVE_W32_SYSTEM
+ 
+ 
+ libgcrypt_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
++	-Wc,-fplugin=annobin \
+ 	$(libgcrypt_version_script_cmd) -version-info \
+ 	@LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@
+ libgcrypt_la_DEPENDENCIES = \
+Only in libgcrypt-1.8.3/src: Makefile.am.annobin
+diff -rup libgcrypt.orig/src/Makefile.in libgcrypt-1.8.3/src/Makefile.in
+--- libgcrypt.orig/src/Makefile.in	2021-10-18 16:36:20.914025497 +0100
++++ libgcrypt-1.8.3/src/Makefile.in	2021-10-19 12:23:37.791875325 +0100
+@@ -483,6 +483,7 @@ gcrypt_hwf_modules = @GCRYPT_HWF_MODULES
+ @HAVE_W32_SYSTEM_TRUE@gcrypt_deps = $(gcrypt_res) libgcrypt.def
+ @HAVE_W32_SYSTEM_FALSE@gcrypt_res_ldflag = 
+ libgcrypt_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
++	-Wc,-fplugin=annobin \
+ 	$(libgcrypt_version_script_cmd) -version-info \
+ 	@LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@

libgcrypt-1.6.1-ecc-test-fix.patch

@@ -1,214 +0,0 @@
-diff -up libgcrypt-1.6.1/tests/benchmark.c.eccfix libgcrypt-1.6.1/tests/benchmark.c
---- libgcrypt-1.6.1/tests/benchmark.c.eccfix	2014-01-27 14:36:43.000000000 +0100
-+++ libgcrypt-1.6.1/tests/benchmark.c	2014-02-28 16:14:13.042505538 +0100
-@@ -1087,8 +1087,7 @@ ecc_bench (int iterations, int print_hea
- {
- #if USE_ECC
-   gpg_error_t err;
--  const char *p_sizes[] = { "192", "224", "256", "384", "521", "Ed25519",
--              "gost256", "gost512" };
-+  const char *p_sizes[] = { "256", "384", "521", "Ed25519" };
-   int testno;
- 
-   if (print_header)
-diff -up libgcrypt-1.6.1/tests/dsa-rfc6979.c.eccfix libgcrypt-1.6.1/tests/dsa-rfc6979.c
---- libgcrypt-1.6.1/tests/dsa-rfc6979.c.eccfix	2013-12-16 18:44:32.000000000 +0100
-+++ libgcrypt-1.6.1/tests/dsa-rfc6979.c	2014-02-28 16:18:44.138771523 +0100
-@@ -210,27 +210,6 @@ check_dsa_rfc6979 (void)
-       " ))"
-     },
-     {
--      "ECDSA, 192 bits (prime field)",
--      "(private-key"
--      " (ecdsa"
--      " (curve \"NIST P-192\")"
--      " (q #04AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56"
--      "       3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43#)"
--      " (d #6FAB034934E4C0FC9AE67F5B5659A9D7D1FEFD187EE09FD4#)"
--      " ))"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "(private-key"
--      " (ecdsa"
--      " (curve \"NIST P-224\")"
--      " (q #04"
--      "     00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C"
--      "     EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A#)"
--      " (d #F220266E1105BFE3083E03EC7A3A654651F45E37167E88600BF257C1#)"
--      " ))"
--    },
--    {
-       "ECDSA, 256 bits (prime field)",
-       "(private-key"
-       " (ecdsa"
-@@ -443,169 +422,6 @@ check_dsa_rfc6979 (void)
-       "C9F0BDABCC0D880BB137A994CC7F3980CE91CC10FAF529FC46565B15CEA854E1"
-     },
-     {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-1, message = \"sample\"",
--      "sha1", "sample",
--      "37D7CA00D2C7B0E5E412AC03BD44BA837FDD5B28CD3B0021",
--      "98C6BD12B23EAF5E2A2045132086BE3EB8EBD62ABF6698FF",
--      "57A22B07DEA9530F8DE9471B1DC6624472E8E2844BC25B64"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-224, message = \"sample\"",
--      "sha224", "sample",
--      "4381526B3FC1E7128F202E194505592F01D5FF4C5AF015D8",
--      "A1F00DAD97AEEC91C95585F36200C65F3C01812AA60378F5",
--      "E07EC1304C7C6C9DEBBE980B9692668F81D4DE7922A0F97A"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-256, message = \"sample\"",
--      "sha256", "sample",
--      "32B1B6D7D42A05CB449065727A84804FB1A3E34D8F261496",
--      "4B0B8CE98A92866A2820E20AA6B75B56382E0F9BFD5ECB55",
--      "CCDB006926EA9565CBADC840829D8C384E06DE1F1E381B85"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-384, message = \"sample\"",
--      "sha384", "sample",
--      "4730005C4FCB01834C063A7B6760096DBE284B8252EF4311",
--      "DA63BF0B9ABCF948FBB1E9167F136145F7A20426DCC287D5",
--      "C3AA2C960972BD7A2003A57E1C4C77F0578F8AE95E31EC5E"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-512, message = \"sample\"",
--      "sha512", "sample",
--      "A2AC7AB055E4F20692D49209544C203A7D1F2C0BFBC75DB1",
--      "4D60C5AB1996BD848343B31C00850205E2EA6922DAC2E4B8",
--      "3F6E837448F027A1BF4B34E796E32A811CBB4050908D8F67"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-1, message = \"test\"",
--      "sha1", "test",
--      "D9CF9C3D3297D3260773A1DA7418DB5537AB8DD93DE7FA25",
--      "0F2141A0EBBC44D2E1AF90A50EBCFCE5E197B3B7D4DE036D",
--      "EB18BC9E1F3D7387500CB99CF5F7C157070A8961E38700B7"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-224, message = \"test\"",
--      "sha224", "test",
--      "F5DC805F76EF851800700CCE82E7B98D8911B7D510059FBE",
--      "6945A1C1D1B2206B8145548F633BB61CEF04891BAF26ED34",
--      "B7FB7FDFC339C0B9BD61A9F5A8EAF9BE58FC5CBA2CB15293"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-256, message = \"test\"",
--      "sha256", "test",
--      "5C4CE89CF56D9E7C77C8585339B006B97B5F0680B4306C6C",
--      "3A718BD8B4926C3B52EE6BBE67EF79B18CB6EB62B1AD97AE",
--      "5662E6848A4A19B1F1AE2F72ACD4B8BBE50F1EAC65D9124F"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-384, message = \"test\"",
--      "sha384", "test",
--      "5AFEFB5D3393261B828DB6C91FBC68C230727B030C975693",
--      "B234B60B4DB75A733E19280A7A6034BD6B1EE88AF5332367",
--      "7994090B2D59BB782BE57E74A44C9A1C700413F8ABEFE77A"
--    },
--    {
--      "ECDSA, 192 bits (prime field)",
--      "With SHA-512, message = \"test\"",
--      "sha512", "test",
--      "0758753A5254759C7CFBAD2E2D9B0792EEE44136C9480527",
--      "FE4F4AE86A58B6507946715934FE2D8FF9D95B6B098FE739",
--      "74CF5605C98FBA0E1EF34D4B5A1577A7DCF59457CAE52290"
--    },
--
--
--
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-1, message = \"sample\"",
--      "sha1", "sample",
--      "7EEFADD91110D8DE6C2C470831387C50D3357F7F4D477054B8B426BC",
--      "22226F9D40A96E19C4A301CE5B74B115303C0F3A4FD30FC257FB57AC",
--      "66D1CDD83E3AF75605DD6E2FEFF196D30AA7ED7A2EDF7AF475403D69"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-224, message = \"sample\"",
--      "sha224", "sample",
--      "C1D1F2F10881088301880506805FEB4825FE09ACB6816C36991AA06D",
--      "1CDFE6662DDE1E4A1EC4CDEDF6A1F5A2FB7FBD9145C12113E6ABFD3E",
--      "A6694FD7718A21053F225D3F46197CA699D45006C06F871808F43EBC"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-256, message = \"sample\"",
--      "sha256", "sample",
--      "AD3029E0278F80643DE33917CE6908C70A8FF50A411F06E41DEDFCDC",
--      "61AA3DA010E8E8406C656BC477A7A7189895E7E840CDFE8FF42307BA",
--      "BC814050DAB5D23770879494F9E0A680DC1AF7161991BDE692B10101"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-384, message = \"sample\"",
--      "sha384", "sample",
--      "52B40F5A9D3D13040F494E83D3906C6079F29981035C7BD51E5CAC40",
--      "0B115E5E36F0F9EC81F1325A5952878D745E19D7BB3EABFABA77E953",
--      "830F34CCDFE826CCFDC81EB4129772E20E122348A2BBD889A1B1AF1D"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-512, message = \"sample\"",
--      "sha512", "sample",
--      "9DB103FFEDEDF9CFDBA05184F925400C1653B8501BAB89CEA0FBEC14",
--      "074BD1D979D5F32BF958DDC61E4FB4872ADCAFEB2256497CDAC30397",
--      "A4CECA196C3D5A1FF31027B33185DC8EE43F288B21AB342E5D8EB084"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-1, message = \"test\"",
--      "sha1", "test",
--      "2519178F82C3F0E4F87ED5883A4E114E5B7A6E374043D8EFD329C253",
--      "DEAA646EC2AF2EA8AD53ED66B2E2DDAA49A12EFD8356561451F3E21C",
--      "95987796F6CF2062AB8135271DE56AE55366C045F6D9593F53787BD2"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-224, message = \"test\"",
--      "sha224", "test",
--      "DF8B38D40DCA3E077D0AC520BF56B6D565134D9B5F2EAE0D34900524",
--      "C441CE8E261DED634E4CF84910E4C5D1D22C5CF3B732BB204DBEF019",
--      "902F42847A63BDC5F6046ADA114953120F99442D76510150F372A3F4"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-256, message = \"test\"",
--      "sha256", "test",
--      "FF86F57924DA248D6E44E8154EB69F0AE2AEBAEE9931D0B5A969F904",
--      "AD04DDE87B84747A243A631EA47A1BA6D1FAA059149AD2440DE6FBA6",
--      "178D49B1AE90E3D8B629BE3DB5683915F4E8C99FDF6E666CF37ADCFD"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-384, message = \"test\"",
--      "sha384", "test",
--      "7046742B839478C1B5BD31DB2E862AD868E1A45C863585B5F22BDC2D",
--      "389B92682E399B26518A95506B52C03BC9379A9DADF3391A21FB0EA4",
--      "414A718ED3249FF6DBC5B50C27F71F01F070944DA22AB1F78F559AAB"
--    },
--    {
--      "ECDSA, 224 bits (prime field)",
--      "With SHA-512, message = \"test\"",
--      "sha512", "test",
--      "E39C2AA4EA6BE2306C72126D40ED77BF9739BB4D6EF2BBB1DCB6169D",
--      "049F050477C5ADD858CAC56208394B5A55BAEBBE887FDF765047C17C",
--      "077EB13E7005929CEFA3CD0403C7CDCC077ADF4E44F3C41B2F60ECFF"
--    },
--    {
-       "ECDSA, 256 bits (prime field)",
-       "With SHA-1, message = \"sample\"",
-       "sha1", "sample",

libgcrypt-1.6.1-fips-cfgrandom.patch

@@ -1,141 +0,0 @@
-diff -up libgcrypt-1.6.1/random/random-fips.c.cfgrandom libgcrypt-1.6.1/random/random-fips.c
---- libgcrypt-1.6.1/random/random-fips.c.cfgrandom	2014-02-28 16:06:20.026572478 +0100
-+++ libgcrypt-1.6.1/random/random-fips.c	2014-02-28 16:06:34.851915121 +0100
-@@ -27,10 +27,10 @@
-    There are 3 random context which map to the different levels of
-    random quality:
- 
--   Generator                Seed and Key        Kernel entropy (init/reseed)
--   ------------------------------------------------------------
--   GCRY_VERY_STRONG_RANDOM  /dev/random         256/128 bits
--   GCRY_STRONG_RANDOM       /dev/random         256/128 bits
-+   Generator                Seed and Key                      Kernel entropy (init/reseed)
-+   ---------------------------------------------------------------------------------------
-+   GCRY_VERY_STRONG_RANDOM  /etc/gcrypt/rngseed+/dev/urandom  256/128 bits
-+   GCRY_STRONG_RANDOM       /etc/gcrypt/rngseed+/dev/urandom  256/128 bits
-    gcry_create_nonce        GCRY_STRONG_RANDOM  n/a
- 
-    All random generators return their data in 128 bit blocks.  If the
-@@ -40,8 +40,10 @@
-    (SEED_TTL) output blocks; the re-seeding is disabled in test mode.
- 
-    The GCRY_VERY_STRONG_RANDOM and GCRY_STRONG_RANDOM generators are
--   keyed and seeded from the /dev/random device.  Thus these
--   generators may block until the kernel has collected enough entropy.
-+   keyed and seeded with data that is loaded from the /etc/gcrypt/rngseed
-+   if the device or symlink to device exists xored with the data
-+   from the /dev/urandom device. This allows the system administrator
-+   to always seed the RNGs from /dev/random if it is required.
- 
-    The gcry_create_nonce generator is keyed and seeded from the
-    GCRY_STRONG_RANDOM generator.  It may also block if the
-@@ -560,9 +562,13 @@ get_entropy (size_t nbytes)
-   entropy_collect_buffer_len = 0;
- 
- #if USE_RNDLINUX
-+  _gcry_rndlinux_gather_random (entropy_collect_cb, 0,
-+                                     X931_AES_KEYLEN,
-+                                     -1);
-+  entropy_collect_buffer_len = 0;
-   rc = _gcry_rndlinux_gather_random (entropy_collect_cb, 0,
-                                      X931_AES_KEYLEN,
--                                     GCRY_VERY_STRONG_RANDOM);
-+                                     GCRY_STRONG_RANDOM);
- #elif USE_RNDW32
-   do
-     {
-@@ -713,7 +719,7 @@ get_random (void *buffer, size_t length,
-       || rng_ctx->seed_init_pid != getpid ())
-     {
-       /* Just reinitialize the key & seed. */
--      gcry_cipher_close(rng_ctx->cipher_hd);
-+      _gcry_cipher_close(rng_ctx->cipher_hd);
-       rng_ctx->cipher_hd = NULL;
-       rng_ctx->is_seeded = 0;
-       goto reinitialize;
-diff -up libgcrypt-1.6.1/random/rndlinux.c.cfgrandom libgcrypt-1.6.1/random/rndlinux.c
---- libgcrypt-1.6.1/random/rndlinux.c.cfgrandom	2013-12-16 18:44:32.000000000 +0100
-+++ libgcrypt-1.6.1/random/rndlinux.c	2014-02-28 16:06:20.027572501 +0100
-@@ -36,7 +36,9 @@
- #include "g10lib.h"
- #include "rand-internal.h"
- 
--static int open_device (const char *name, int retry);
-+#define NAME_OF_CFG_RNGSEED "/etc/gcrypt/rngseed"
-+
-+static int open_device (const char *name, int retry, int fatal);
- 
- 
- static int
-@@ -59,7 +61,7 @@ set_cloexec_flag (int fd)
-  * a fatal error but retries until it is able to reopen the device.
-  */
- static int
--open_device (const char *name, int retry)
-+open_device (const char *name, int retry, int fatal)
- {
-   int fd;
- 
-@@ -67,6 +69,8 @@ open_device (const char *name, int retry
-     _gcry_random_progress ("open_dev_random", 'X', 1, 0);
-  again:
-   fd = open (name, O_RDONLY);
-+  if (fd == -1 && !fatal)
-+      return fd;
-   if (fd == -1 && retry)
-     {
-       struct timeval tv;
-@@ -111,6 +115,7 @@ _gcry_rndlinux_gather_random (void (*add
- {
-   static int fd_urandom = -1;
-   static int fd_random = -1;
-+  static int fd_configured = -1;
-   static unsigned char ever_opened;
-   int fd;
-   int n;
-@@ -134,6 +139,11 @@ _gcry_rndlinux_gather_random (void (*add
-           close (fd_urandom);
-           fd_urandom = -1;
-         }
-+      if (fd_configured != -1)
-+        {
-+          close (fd_configured);
-+          fd_configured = -1;
-+        }
-       return 0;
-     }
- 
-@@ -153,20 +163,30 @@ _gcry_rndlinux_gather_random (void (*add
-      that we always require the device to be existent but want a more
-      graceful behaviour if the rarely needed close operation has been
-      used and the device needs to be re-opened later. */
-+
-+  if (level == -1)
-+    {
-+      if (fd_configured == -1)
-+        fd_configured = open_device ( NAME_OF_CFG_RNGSEED, 0, 0 );
-+      fd = fd_configured;
-+      if (fd == -1)
-+        return -1;
-+    }
-+
-   if (level >= 2)
-     {
-       if (fd_random == -1)
-         {
--          fd_random = open_device (NAME_OF_DEV_RANDOM, (ever_opened & 1));
-+          fd_random = open_device (NAME_OF_DEV_RANDOM, (ever_opened & 1), 1);
-           ever_opened |= 1;
-         }
-       fd = fd_random;
-     }
--  else
-+  else if (level != -1)
-     {
-       if (fd_urandom == -1)
-         {
--          fd_urandom = open_device (NAME_OF_DEV_URANDOM, (ever_opened & 2));
-+          fd_urandom = open_device (NAME_OF_DEV_URANDOM, (ever_opened & 2), 1);
-           ever_opened |= 2;
-         }
-       fd = fd_urandom;

libgcrypt-1.6.1-leak.patch

@@ -1,38 +0,0 @@
-diff -up libgcrypt-1.6.1/cipher/primegen.c.leak libgcrypt-1.6.1/cipher/primegen.c
---- libgcrypt-1.6.1/cipher/primegen.c.leak	2014-02-28 15:06:24.394464790 +0100
-+++ libgcrypt-1.6.1/cipher/primegen.c	2014-02-28 15:09:22.938591664 +0100
-@@ -1204,10 +1204,7 @@ _gcry_prime_group_generator (gcry_mpi_t
-                              gcry_mpi_t prime, gcry_mpi_t *factors,
-                              gcry_mpi_t start_g)
- {
--  gcry_mpi_t tmp   = mpi_new (0);
--  gcry_mpi_t b     = mpi_new (0);
--  gcry_mpi_t pmin1 = mpi_new (0);
--  gcry_mpi_t g = start_g? mpi_copy (start_g) : mpi_set_ui (NULL, 3);
-+  gcry_mpi_t tmp, b, pmin1, g;
-   int first = 1;
-   int i, n;
- 
-@@ -1220,6 +1217,11 @@ _gcry_prime_group_generator (gcry_mpi_t
-   if (n < 2)
-     return GPG_ERR_INV_ARG;
- 
-+  tmp = mpi_new (0);
-+  b = mpi_new (0);
-+  pmin1 = mpi_new (0);
-+  g = start_g? mpi_copy (start_g) : mpi_set_ui (NULL, 3);
-+
-   /* Extra sanity check - usually disabled. */
- /*   mpi_set (tmp, factors[0]); */
- /*   for(i = 1; i < n; i++) */
-diff -up libgcrypt-1.6.1/src/hmac256.c.leak libgcrypt-1.6.1/src/hmac256.c
---- libgcrypt-1.6.1/src/hmac256.c.leak	2013-12-16 18:44:32.000000000 +0100
-+++ libgcrypt-1.6.1/src/hmac256.c	2014-02-28 15:06:24.394464790 +0100
-@@ -427,7 +427,6 @@ _gcry_hmac256_finalize (hmac256_context_
-       tmphd = _gcry_hmac256_new (NULL, 0);
-       if (!tmphd)
-         {
--          free (hd);
-           return NULL;
-         }
-       _gcry_hmac256_update (tmphd, hd->opad, 64);

libgcrypt-1.6.1-mpicoder-gccopt.patch

@@ -1,104 +0,0 @@
-diff -up libgcrypt-1.6.1/mpi/mpicoder.c.gccopt libgcrypt-1.6.1/mpi/mpicoder.c
---- libgcrypt-1.6.1/mpi/mpicoder.c.gccopt	2014-02-28 15:37:53.983139821 +0100
-+++ libgcrypt-1.6.1/mpi/mpicoder.c	2014-02-28 15:47:35.312576387 +0100
-@@ -627,16 +627,16 @@ _gcry_mpi_print (enum gcry_mpi_format fo
-           extra = 1;
- 	}
- 
--      if (buffer && n > len)
--        {
--          /* The provided buffer is too short. */
--          xfree (tmp);
--          return GPG_ERR_TOO_SHORT;
--	}
-       if (buffer)
-         {
-           unsigned char *s = buffer;
- 
-+          if (n > len)
-+            {
-+              /* The provided buffer is too short. */
-+              xfree (tmp);
-+              return GPG_ERR_TOO_SHORT;
-+            }
-           if (extra == 1)
-             *s++ = 0;
-           else if (extra)
-@@ -654,13 +654,12 @@ _gcry_mpi_print (enum gcry_mpi_format fo
-       /* Note:  We ignore the sign for this format.  */
-       /* FIXME: for performance reasons we should put this into
- 	 mpi_aprint because we can then use the buffer directly.  */
--
--      if (buffer && n > len)
--        return GPG_ERR_TOO_SHORT;
-       if (buffer)
-         {
-           unsigned char *tmp;
- 
-+          if (n > len)
-+            return GPG_ERR_TOO_SHORT;
-           tmp = _gcry_mpi_get_buffer (a, 0, &n, NULL);
-           if (!tmp)
-             return gpg_err_code_from_syserror ();
-@@ -678,14 +677,14 @@ _gcry_mpi_print (enum gcry_mpi_format fo
-       if (negative)
-         return GPG_ERR_INV_ARG;
- 
--      if (buffer && n+2 > len)
--        return GPG_ERR_TOO_SHORT;
--
-       if (buffer)
-         {
-           unsigned char *tmp;
-           unsigned char *s = buffer;
- 
-+          if (n+2 > len)
-+            return GPG_ERR_TOO_SHORT;
-+
-           s[0] = nbits >> 8;
-           s[1] = nbits;
- 
-@@ -724,16 +723,16 @@ _gcry_mpi_print (enum gcry_mpi_format fo
-           extra=1;
- 	}
- 
--      if (buffer && n+4 > len)
--        {
--          xfree(tmp);
--          return GPG_ERR_TOO_SHORT;
--	}
--
-       if (buffer)
-         {
-           unsigned char *s = buffer;
- 
-+          if (n+4 > len)
-+            {
-+              xfree(tmp);
-+              return GPG_ERR_TOO_SHORT;
-+            }
-+
-           *s++ = n >> 24;
-           *s++ = n >> 16;
-           *s++ = n >> 8;
-@@ -761,15 +760,15 @@ _gcry_mpi_print (enum gcry_mpi_format fo
-       if (!n || (*tmp & 0x80))
-         extra = 2;
- 
--      if (buffer && 2*n + extra + negative + 1 > len)
--        {
--          xfree(tmp);
--          return GPG_ERR_TOO_SHORT;
--	}
-       if (buffer)
-         {
-           unsigned char *s = buffer;
- 
-+          if (2*n + extra + negative + 1 > len)
-+            {
-+              xfree(tmp);
-+              return GPG_ERR_TOO_SHORT;
-+	    }
-           if (negative)
-             *s++ = '-';
-           if (extra)

libgcrypt-1.6.1-tests.patch

@@ -1,198 +0,0 @@
-diff -up libgcrypt-1.6.1/cipher/dsa.c.tests libgcrypt-1.6.1/cipher/dsa.c
---- libgcrypt-1.6.1/cipher/dsa.c.tests	2014-02-28 13:39:01.727288335 +0100
-+++ libgcrypt-1.6.1/cipher/dsa.c	2014-02-28 13:46:21.727458285 +0100
-@@ -423,22 +423,29 @@ generate_fips186 (DSA_secret_key *sk, un
-             initial_seed.seed = sexp_nth_data (initial_seed.sexp, 1,
-                                                     &initial_seed.seedlen);
-         }
--
--      /* Fixme: Enable 186-3 after it has been approved and after fixing
--         the generation function.  */
--      /*   if (use_fips186_2) */
--      (void)use_fips186_2;
--      ec = _gcry_generate_fips186_2_prime (nbits, qbits,
-+      if (use_fips186_2)
-+        ec = _gcry_generate_fips186_2_prime (nbits, qbits,
-                                            initial_seed.seed,
-                                            initial_seed.seedlen,
-                                            &prime_q, &prime_p,
-                                            r_counter,
-                                            r_seed, r_seedlen);
--      /*   else */
--      /*     ec = _gcry_generate_fips186_3_prime (nbits, qbits, NULL, 0, */
--      /*                                          &prime_q, &prime_p, */
--      /*                                          r_counter, */
--      /*                                          r_seed, r_seedlen, NULL); */
-+      else if (!domain->p || !domain->q)
-+        ec = _gcry_generate_fips186_3_prime (nbits, qbits,
-+                                          initial_seed.seed,
-+                                          initial_seed.seedlen,
-+                                          &prime_q, &prime_p,
-+                                          r_counter,
-+                                          r_seed, r_seedlen, NULL);
-+      else
-+        {
-+          /* Domain parameters p and q are given; use them.  */
-+          prime_p = mpi_copy (domain->p);
-+          prime_q = mpi_copy (domain->q);
-+          gcry_assert (mpi_get_nbits (prime_p) == nbits);
-+          gcry_assert (mpi_get_nbits (prime_q) == qbits);
-+          ec = 0;
-+        }
-       sexp_release (initial_seed.sexp);
-       if (ec)
-         goto leave;
-@@ -829,13 +829,12 @@ dsa_generate (const gcry_sexp_t genparms
-       sexp_release (l1);
-       sexp_release (domainsexp);
- 
--      /* Check that all domain parameters are available.  */
--      if (!domain.p || !domain.q || !domain.g)
-+      /* Check that p and q domain parameters are available.  */
-+      if (!domain.p || !domain.q || (!domain.g && !(flags & PUBKEY_FLAG_USE_FIPS186)))
-         {
-           _gcry_mpi_release (domain.p);
-           _gcry_mpi_release (domain.q);
-           _gcry_mpi_release (domain.g);
--          sexp_release (deriveparms);
-           return GPG_ERR_MISSING_VALUE;
-         }
- 
-diff -up libgcrypt-1.6.1/cipher/primegen.c.tests libgcrypt-1.6.1/cipher/primegen.c
---- libgcrypt-1.6.1/cipher/primegen.c.tests	2014-01-29 10:48:38.000000000 +0100
-+++ libgcrypt-1.6.1/cipher/primegen.c	2014-02-28 13:49:52.291325147 +0100
-@@ -1649,7 +1649,7 @@ _gcry_generate_fips186_3_prime (unsigned
-   gpg_err_code_t ec;
-   unsigned char seed_help_buffer[256/8];  /* Used to hold a generated SEED. */
-   unsigned char *seed_plus;     /* Malloced buffer to hold SEED+x.  */
--  unsigned char digest[256/8];  /* Helper buffer for SHA-1 digest.  */
-+  unsigned char digest[256/8];  /* Helper buffer for SHA-x digest.  */
-   gcry_mpi_t val_2 = NULL;      /* Helper for the prime test.  */
-   gcry_mpi_t tmpval = NULL;     /* Helper variable.  */
-   int hashalgo;                 /* The id of the Approved Hash Function.  */
-@@ -1739,7 +1739,7 @@ _gcry_generate_fips186_3_prime (unsigned
-         }
-       _gcry_mpi_release (prime_q); prime_q = NULL;
-       ec = _gcry_mpi_scan (&prime_q, GCRYMPI_FMT_USG,
--                           value_u, sizeof value_u, NULL);
-+                           value_u, qbits/8, NULL);
-       if (ec)
-         goto leave;
-       mpi_set_highbit (prime_q, qbits-1 );
-@@ -1784,11 +1784,11 @@ _gcry_generate_fips186_3_prime (unsigned
-               if (seed_plus[i])
-                 break;
-             }
--          _gcry_md_hash_buffer (GCRY_MD_SHA1, digest, seed_plus, seedlen);
-+          _gcry_md_hash_buffer (hashalgo, digest, seed_plus, seedlen);
- 
-           _gcry_mpi_release (tmpval); tmpval = NULL;
-           ec = _gcry_mpi_scan (&tmpval, GCRYMPI_FMT_USG,
--                               digest, sizeof digest, NULL);
-+                               digest, qbits/8, NULL);
-           if (ec)
-             goto leave;
-           if (value_j == value_n)
-@@ -1824,11 +1824,11 @@ _gcry_generate_fips186_3_prime (unsigned
-     }
- 
-   /* Step 12:  Save p, q, counter and seed.  */
--  log_debug ("fips186-3 pbits p=%u q=%u counter=%d\n",
-+  /* log_debug ("fips186-3 pbits p=%u q=%u counter=%d\n",
-              mpi_get_nbits (prime_p), mpi_get_nbits (prime_q), counter);
-   log_printhex ("fips186-3 seed", seed, seedlen);
-   log_printmpi ("fips186-3    p", prime_p);
--  log_printmpi ("fips186-3    q", prime_q);
-+  log_printmpi ("fips186-3    q", prime_q); */
-   if (r_q)
-     {
-       *r_q = prime_q;
-diff -up libgcrypt-1.6.1/cipher/rsa.c.tests libgcrypt-1.6.1/cipher/rsa.c
---- libgcrypt-1.6.1/cipher/rsa.c.tests	2014-01-29 08:49:49.000000000 +0100
-+++ libgcrypt-1.6.1/cipher/rsa.c	2014-02-28 13:39:01.727288335 +0100
-@@ -399,7 +399,7 @@ generate_x931 (RSA_secret_key *sk, unsig
- 
-   *swapped = 0;
- 
--  if (e_value == 1)   /* Alias for a secure value. */
-+  if (e_value == 1 || e_value == 0)   /* Alias for a secure value. */
-     e_value = 65537;
- 
-   /* Point 1 of section 4.1:  k = 1024 + 256s with S >= 0  */
-diff -up libgcrypt-1.6.1/random/random-fips.c.tests libgcrypt-1.6.1/random/random-fips.c
---- libgcrypt-1.6.1/random/random-fips.c.tests	2014-01-29 10:48:38.000000000 +0100
-+++ libgcrypt-1.6.1/random/random-fips.c	2014-02-28 13:39:01.727288335 +0100
-@@ -692,6 +692,7 @@ get_random (void *buffer, size_t length,
- 
-   check_guards (rng_ctx);
- 
-+ reinitialize:
-   /* Initialize the cipher handle and thus setup the key if needed.  */
-   if (!rng_ctx->cipher_hd)
-     {
-@@ -711,13 +712,11 @@ get_random (void *buffer, size_t length,
-   if (rng_ctx->key_init_pid != getpid ()
-       || rng_ctx->seed_init_pid != getpid ())
-     {
--      /* We are in a child of us.  Because we have no way yet to do
--         proper re-initialization (including self-checks etc), the
--         only chance we have is to bail out.  Obviusly a fork/exec
--         won't harm because the exec overwrites the old image. */
--      fips_signal_error ("fork without proper re-initialization "
--                         "detected in RNG");
--      goto bailout;
-+      /* Just reinitialize the key & seed. */
-+      gcry_cipher_close(rng_ctx->cipher_hd);
-+      rng_ctx->cipher_hd = NULL;
-+      rng_ctx->is_seeded = 0;
-+      goto reinitialize;
-     }
- 
-   if (x931_aes_driver (buffer, length, rng_ctx))
-diff -up libgcrypt-1.6.1/tests/keygen.c.tests libgcrypt-1.6.1/tests/keygen.c
---- libgcrypt-1.6.1/tests/keygen.c.tests	2014-02-28 13:39:01.728288358 +0100
-+++ libgcrypt-1.6.1/tests/keygen.c	2014-02-28 13:42:18.288831563 +0100
-@@ -215,11 +215,11 @@ check_rsa_keys (void)
- 
- 
-   if (verbose)
--    show ("creating 512 bit RSA key with e=257\n");
-+    show ("creating 1024 bit RSA key with e=257\n");
-   rc = gcry_sexp_new (&keyparm,
-                       "(genkey\n"
-                       " (rsa\n"
--                      "  (nbits 3:512)\n"
-+                      "  (nbits 4:1024)\n"
-                       "  (rsa-use-e 3:257)\n"
-                       " ))", 0, 1);
-   if (rc)
-@@ -233,11 +233,11 @@ check_rsa_keys (void)
-   gcry_sexp_release (key);
- 
-   if (verbose)
--    show ("creating 512 bit RSA key with default e\n");
-+    show ("creating 1024 bit RSA key with default e\n");
-   rc = gcry_sexp_new (&keyparm,
-                       "(genkey\n"
-                       " (rsa\n"
--                      "  (nbits 3:512)\n"
-+                      "  (nbits 4:1024)\n"
-                       "  (rsa-use-e 1:0)\n"
-                       " ))", 0, 1);
-   if (rc)
-@@ -307,12 +307,12 @@ check_dsa_keys (void)
-     }
- 
-   if (verbose)
--    show ("creating 1536 bit DSA key\n");
-+    show ("creating 2048 bit DSA key\n");
-   rc = gcry_sexp_new (&keyparm,
-                       "(genkey\n"
-                       " (dsa\n"
--                      "  (nbits 4:1536)\n"
--                      "  (qbits 3:224)\n"
-+                      "  (nbits 4:2048)\n"
-+                      "  (qbits 3:256)\n"
-                       " ))", 0, 1);
-   if (rc)
-     die ("error creating S-expression: %s\n", gpg_strerror (rc));

libgcrypt-1.6.1-use-poll.patch

@@ -1,71 +0,0 @@
-diff -up libgcrypt-1.6.1/random/rndlinux.c.use-poll libgcrypt-1.6.1/random/rndlinux.c
---- libgcrypt-1.6.1/random/rndlinux.c.use-poll	2014-02-28 15:17:55.294433915 +0100
-+++ libgcrypt-1.6.1/random/rndlinux.c	2014-02-28 15:34:52.505945274 +0100
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <poll.h>
- #include "types.h"
- #include "g10lib.h"
- #include "rand-internal.h"
-@@ -199,9 +200,11 @@ _gcry_rndlinux_gather_random (void (*add
-                  return with something we will actually use 100ms. */
-   while (length)
-     {
--      fd_set rfds;
--      struct timeval tv;
-       int rc;
-+      struct pollfd pfd;
-+
-+      pfd.fd = fd;
-+      pfd.events = POLLIN;
- 
-       /* If we collected some bytes update the progress indicator.  We
-          do this always and not just if the select timed out because
-@@ -215,33 +218,18 @@ _gcry_rndlinux_gather_random (void (*add
-           any_need_entropy = 1;
-         }
- 
--      /* If the system has no limit on the number of file descriptors
--         and we encounter an fd which is larger than the fd_set size,
--         we don't use the select at all.  The select code is only used
--         to emit progress messages.  A better solution would be to
--         fall back to poll() if available.  */
--#ifdef FD_SETSIZE
--      if (fd < FD_SETSIZE)
--#endif
--        {
--          FD_ZERO(&rfds);
--          FD_SET(fd, &rfds);
--          tv.tv_sec = delay;
--          tv.tv_usec = delay? 0 : 100000;
--          if ( !(rc=select(fd+1, &rfds, NULL, NULL, &tv)) )
--            {
--              any_need_entropy = 1;
--              delay = 3; /* Use 3 seconds henceforth.  */
--              continue;
--            }
--          else if( rc == -1 )
--            {
--              log_error ("select() error: %s\n", strerror(errno));
--              if (!delay)
--                delay = 1; /* Use 1 second if we encounter an error before
--                              we have ever blocked.  */
--              continue;
--            }
-+      if ( !(rc=poll(&pfd, 1, delay)) )
-+        {
-+          delay = 3000; /* Use 3 seconds henceforth.  */
-+          continue;
-+        }
-+        else if( rc == -1 )
-+        {
-+          log_error ("poll() error: %s\n", strerror(errno));
-+          if (!delay)
-+            delay = 1000; /* Use 1 second if we encounter an error before
-+                          we have ever blocked.  */
-+          continue;
-         }
- 
-       do

libgcrypt-1.6.2-fips-ctor.patch

@@ -1,74 +0,0 @@
-diff -up libgcrypt-1.6.2/cipher/md.c.fips-ctor libgcrypt-1.6.2/cipher/md.c
---- libgcrypt-1.6.2/cipher/md.c.fips-ctor	2014-08-21 14:50:39.000000000 +0200
-+++ libgcrypt-1.6.2/cipher/md.c	2015-02-25 13:57:21.175704866 +0100
-@@ -413,11 +413,8 @@ md_enable (gcry_md_hd_t hd, int algorith
- 
-   if (!err && algorithm == GCRY_MD_MD5 && fips_mode ())
-     {
--      _gcry_inactivate_fips_mode ("MD5 used");
-       if (_gcry_enforced_fips_mode () )
-         {
--          /* We should never get to here because we do not register
--             MD5 in enforced fips mode. But better throw an error.  */
-           err = GPG_ERR_DIGEST_ALGO;
-         }
-     }
-diff -up libgcrypt-1.6.2/src/global.c.fips-ctor libgcrypt-1.6.2/src/global.c
---- libgcrypt-1.6.2/src/global.c.fips-ctor	2015-02-25 13:57:21.174704842 +0100
-+++ libgcrypt-1.6.2/src/global.c	2015-02-25 14:03:07.066864208 +0100
-@@ -132,6 +132,36 @@ global_init (void)
- }
- 
- 
-+#ifndef FIPS_MODULE_PATH
-+#define FIPS_MODULE_PATH "/etc/system-fips"
-+#endif
-+
-+void __attribute__ ((constructor)) _gcry_global_constructor (void)
-+{
-+  int rv;
-+
-+  rv = access (FIPS_MODULE_PATH, F_OK);
-+  if (rv < 0 && errno != ENOENT)
-+    rv = 0;
-+
-+  if (!rv)
-+    {
-+      int no_secmem_save;
-+
-+      /* it should be always 0 at this point but let's keep on the safe side */
-+      no_secmem_save = no_secure_memory;
-+      no_secure_memory = 1;
-+      /* force selftests */
-+      global_init ();
-+      if (fips_mode ())
-+         _gcry_random_initialize (1);
-+      _gcry_fips_run_selftests (0);
-+      if (!fips_mode())
-+         _gcry_random_close_fds ();
-+      no_secure_memory = no_secmem_save;
-+    }
-+}
-+
- /* This function is called by the macro fips_is_operational and makes
-    sure that the minimal initialization has been done.  This is far
-    from a perfect solution and hides problems with an improper
-@@ -542,8 +572,7 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd,
- 
-     case GCRYCTL_FIPS_MODE_P:
-       if (fips_mode ()
--          && !_gcry_is_fips_mode_inactive ()
--          && !no_secure_memory)
-+          && !_gcry_is_fips_mode_inactive ())
- 	rc = GPG_ERR_GENERAL; /* Used as TRUE value */
-       break;
- 
-@@ -635,7 +664,7 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd,
-       break;
- 
-     case GCRYCTL_SET_ENFORCED_FIPS_FLAG:
--      if (!any_init_done)
-+      if (fips_mode ())
-         {
-           /* Not yet initialized at all.  Set the enforced fips mode flag */
-           _gcry_set_preferred_rng_type (0);

libgcrypt-1.6.2-fips-reqs.patch

@@ -1,345 +0,0 @@
-diff -up libgcrypt-1.6.2/cipher/dsa.c.fips-reqs libgcrypt-1.6.2/cipher/dsa.c
---- libgcrypt-1.6.2/cipher/dsa.c.fips-reqs	2014-12-08 17:15:07.198102721 +0100
-+++ libgcrypt-1.6.2/cipher/dsa.c	2014-12-08 17:16:59.636645610 +0100
-@@ -66,42 +66,86 @@ static const char *dsa_names[] =
-   };
- 
- 
--/* A sample 1024 bit DSA key used for the selftests.  */
-+/* A sample 2048 bit DSA key used for the selftests.  */
- static const char sample_secret_key[] =
- "(private-key"
- " (dsa"
--"  (p #00AD7C0025BA1A15F775F3F2D673718391D00456978D347B33D7B49E7F32EDAB"
--"      96273899DD8B2BB46CD6ECA263FAF04A28903503D59062A8865D2AE8ADFB5191"
--"      CF36FFB562D0E2F5809801A1F675DAE59698A9E01EFE8D7DCFCA084F4C6F5A44"
--"      44D499A06FFAEA5E8EF5E01F2FD20A7B7EF3F6968AFBA1FB8D91F1559D52D8777B#)"
--"  (q #00EB7B5751D25EBBB7BD59D920315FD840E19AEBF9#)"
--"  (g #1574363387FDFD1DDF38F4FBE135BB20C7EE4772FB94C337AF86EA8E49666503"
--"      AE04B6BE81A2F8DD095311E0217ACA698A11E6C5D33CCDAE71498ED35D13991E"
--"      B02F09AB40BD8F4C5ED8C75DA779D0AE104BC34C960B002377068AB4B5A1F984"
--"      3FBA91F537F1B7CAC4D8DD6D89B0D863AF7025D549F9C765D2FC07EE208F8D15#)"
--"  (y #64B11EF8871BE4AB572AA810D5D3CA11A6CDBC637A8014602C72960DB135BF46"
--"      A1816A724C34F87330FC9E187C5D66897A04535CC2AC9164A7150ABFA8179827"
--"      6E45831AB811EEE848EBB24D9F5F2883B6E5DDC4C659DEF944DCFD80BF4D0A20"
--"      42CAA7DC289F0C5A9D155F02D3D551DB741A81695B74D4C8F477F9C7838EB0FB#)"
--"  (x #11D54E4ADBD3034160F2CED4B7CD292A4EBF3EC0#)))";
--/* A sample 1024 bit DSA key used for the selftests (public only).  */
-+"  (p #a85378d8fd3f8d72ec7418080da21317e43ec4b62ba8c862"
-+"      3b7e4d04441dd1a0658662596493ca8e9e8fbb7e34aaddb6"
-+"      2e5d67b6d09a6e61b769e7c352aa2b10e20ca0636963b552"
-+"      3e86470decbbeda027e797e7b67635d4d49c30700e74af8a"
-+"      0ff156a801af57a26e7078f1d82f74908ecb6d07e70b3503"
-+"      eed94fa32cf17a7fc3d6cf40dc7b00830e6a2566dc073e34"
-+"      3312517c6aa5152b4bfecd2e551fee346318a153423c996b"
-+"      0d5dcb9102aedd38798616f1f1e0d6c403525b1f9b3d4dc7"
-+"      66de2dfc4a56d7b8ba5963d60f3e16318870ad436952e557"
-+"      65374eab85e8ec17d6b9a4547b9b5f2752f3105be809b23a"
-+"      2c8d7469db02e24d592394a7dba069e9#)"
-+"  (q #d277044e50f5a4e3f510a50a0b84fdffbca047ed27602056"
-+"      7441a0a5#)"
-+"  (g #13d754e21fd241655da891c522a65a72a89bdc64ec9b54a8"
-+"      21ed4a898b490e0c4fcb72192a4a20f541f3f2925399f0ba"
-+"      ecf929aafbf79dfe4332393b32cd2e2fcf272f32a627434a"
-+"      0df242b75b414df372121e53a553f222f836b000f016485b"
-+"      6bd0898451801dcd8de64cd5365696ffc532d528c506620a"
-+"      942a0305046d8f1876341f1e570bc3974ba6b9a438e97023"
-+"      02a2e6e67bfd06d32bc679962271d7b40cd72f386e64e0d7"
-+"      ef86ca8ca5d14228dc2a4f16e3189886b5990674f4200f3a"
-+"      4cf65a3f0ddba1fa672dff2f5e143d10e4e97ae84f6da095"
-+"      35d5b9df259181a79b63b069e949972b02ba36b3586aab7e"
-+"      45f322f82e4e85ca3ab85591b3c2a966#)"
-+"  (y #2452f3ccbe9ed5ca7dc74c602b99226e8f2fab38e7d7ddfb"
-+"      75539b17155e9fcfd1aba564eb8535d812c9c2dcf9728444"
-+"      1bc482243624c7f457580c1c38a57c46c457392470edb52c"
-+"      b5a6e03fe6287bb6f49a42a2065a054f030839df1fd3149c"
-+"      4ca0531dd8ca8aaa9cc7337193387348336118224545e88c"
-+"      80ffd8765d74360333ccab9972779b6525a65bdd0d10c675"
-+"      c109bbd3e5be4d72ef6eba6e438d5226237db888379c5fcc"
-+"      47a3847ff63711baed6d03afe81e694a413b680bd38ab490"
-+"      3f8370a707ef551d4941026d9579d691de8edaa16105eb9d"
-+"      ba3c2f4c1bec508275aa0207e251b5eccb286a4b01d449d3"
-+"      0acb673717a0d2fb3b50c893f7dab14f#)"
-+"  (x #0c4b3089d1b862cb3c436491f0915470c52796e3acbee800"
-+"      ec55f6cc#)))";
-+/* A sample 2048 bit DSA key used for the selftests (public only).  */
- static const char sample_public_key[] =
- "(public-key"
- " (dsa"
--"  (p #00AD7C0025BA1A15F775F3F2D673718391D00456978D347B33D7B49E7F32EDAB"
--"      96273899DD8B2BB46CD6ECA263FAF04A28903503D59062A8865D2AE8ADFB5191"
--"      CF36FFB562D0E2F5809801A1F675DAE59698A9E01EFE8D7DCFCA084F4C6F5A44"
--"      44D499A06FFAEA5E8EF5E01F2FD20A7B7EF3F6968AFBA1FB8D91F1559D52D8777B#)"
--"  (q #00EB7B5751D25EBBB7BD59D920315FD840E19AEBF9#)"
--"  (g #1574363387FDFD1DDF38F4FBE135BB20C7EE4772FB94C337AF86EA8E49666503"
--"      AE04B6BE81A2F8DD095311E0217ACA698A11E6C5D33CCDAE71498ED35D13991E"
--"      B02F09AB40BD8F4C5ED8C75DA779D0AE104BC34C960B002377068AB4B5A1F984"
--"      3FBA91F537F1B7CAC4D8DD6D89B0D863AF7025D549F9C765D2FC07EE208F8D15#)"
--"  (y #64B11EF8871BE4AB572AA810D5D3CA11A6CDBC637A8014602C72960DB135BF46"
--"      A1816A724C34F87330FC9E187C5D66897A04535CC2AC9164A7150ABFA8179827"
--"      6E45831AB811EEE848EBB24D9F5F2883B6E5DDC4C659DEF944DCFD80BF4D0A20"
--"      42CAA7DC289F0C5A9D155F02D3D551DB741A81695B74D4C8F477F9C7838EB0FB#)))";
--
-+"  (p #a85378d8fd3f8d72ec7418080da21317e43ec4b62ba8c862"
-+"      3b7e4d04441dd1a0658662596493ca8e9e8fbb7e34aaddb6"
-+"      2e5d67b6d09a6e61b769e7c352aa2b10e20ca0636963b552"
-+"      3e86470decbbeda027e797e7b67635d4d49c30700e74af8a"
-+"      0ff156a801af57a26e7078f1d82f74908ecb6d07e70b3503"
-+"      eed94fa32cf17a7fc3d6cf40dc7b00830e6a2566dc073e34"
-+"      3312517c6aa5152b4bfecd2e551fee346318a153423c996b"
-+"      0d5dcb9102aedd38798616f1f1e0d6c403525b1f9b3d4dc7"
-+"      66de2dfc4a56d7b8ba5963d60f3e16318870ad436952e557"
-+"      65374eab85e8ec17d6b9a4547b9b5f2752f3105be809b23a"
-+"      2c8d7469db02e24d592394a7dba069e9#)"
-+"  (q #d277044e50f5a4e3f510a50a0b84fdffbca047ed27602056"
-+"      7441a0a5#)"
-+"  (g #13d754e21fd241655da891c522a65a72a89bdc64ec9b54a8"
-+"      21ed4a898b490e0c4fcb72192a4a20f541f3f2925399f0ba"
-+"      ecf929aafbf79dfe4332393b32cd2e2fcf272f32a627434a"
-+"      0df242b75b414df372121e53a553f222f836b000f016485b"
-+"      6bd0898451801dcd8de64cd5365696ffc532d528c506620a"
-+"      942a0305046d8f1876341f1e570bc3974ba6b9a438e97023"
-+"      02a2e6e67bfd06d32bc679962271d7b40cd72f386e64e0d7"
-+"      ef86ca8ca5d14228dc2a4f16e3189886b5990674f4200f3a"
-+"      4cf65a3f0ddba1fa672dff2f5e143d10e4e97ae84f6da095"
-+"      35d5b9df259181a79b63b069e949972b02ba36b3586aab7e"
-+"      45f322f82e4e85ca3ab85591b3c2a966#)"
-+"  (y #2452f3ccbe9ed5ca7dc74c602b99226e8f2fab38e7d7ddfb"
-+"      75539b17155e9fcfd1aba564eb8535d812c9c2dcf9728444"
-+"      1bc482243624c7f457580c1c38a57c46c457392470edb52c"
-+"      b5a6e03fe6287bb6f49a42a2065a054f030839df1fd3149c"
-+"      4ca0531dd8ca8aaa9cc7337193387348336118224545e88c"
-+"      80ffd8765d74360333ccab9972779b6525a65bdd0d10c675"
-+"      c109bbd3e5be4d72ef6eba6e438d5226237db888379c5fcc"
-+"      47a3847ff63711baed6d03afe81e694a413b680bd38ab490"
-+"      3f8370a707ef551d4941026d9579d691de8edaa16105eb9d"
-+"      ba3c2f4c1bec508275aa0207e251b5eccb286a4b01d449d3"
-+"      0acb673717a0d2fb3b50c893f7dab14f#)))";
- 
- 
- 
-@@ -1164,14 +1208,14 @@ dsa_get_nbits (gcry_sexp_t parms)
-  */
- 
- static const char *
--selftest_sign_1024 (gcry_sexp_t pkey, gcry_sexp_t skey)
-+selftest_sign (gcry_sexp_t pkey, gcry_sexp_t skey)
- {
-   static const char sample_data[] =
-     "(data (flags raw)"
--    " (value #a0b1c2d3e4f500102030405060708090a1b2c3d4#))";
-+    " (value #a0b1c2d3e4f500102030405060708090a1b2c3d4f1e2d3c4b5a6978879605142#))";
-   static const char sample_data_bad[] =
-     "(data (flags raw)"
--    " (value #a0b1c2d3e4f510102030405060708090a1b2c3d4#))";
-+    " (value #a0b1c2d3e4f500102030405060708090a1b2c3d401e2d3c4b5a6978879605142#))";
- 
-   const char *errtxt = NULL;
-   gcry_error_t err;
-@@ -1247,7 +1291,7 @@ selftests_dsa (selftest_report_func_t re
-     }
- 
-   what = "sign";
--  errtxt = selftest_sign_1024 (pkey, skey);
-+  errtxt = selftest_sign (pkey, skey);
-   if (errtxt)
-     goto failed;
- 
-diff -up libgcrypt-1.6.2/cipher/rsa.c.fips-reqs libgcrypt-1.6.2/cipher/rsa.c
---- libgcrypt-1.6.2/cipher/rsa.c.fips-reqs	2014-12-08 17:15:07.218103174 +0100
-+++ libgcrypt-1.6.2/cipher/rsa.c	2014-12-08 17:20:24.666282521 +0100
-@@ -62,33 +62,57 @@ static const char *rsa_names[] =
-   };
- 
- 
--/* A sample 1024 bit RSA key used for the selftests.  */
-+/* A sample 2048 bit RSA key used for the selftests.  */
- static const char sample_secret_key[] =
- "(private-key"
- " (rsa"
--"  (n #00e0ce96f90b6c9e02f3922beada93fe50a875eac6bcc18bb9a9cf2e84965caa"
--"      2d1ff95a7f542465c6c0c19d276e4526ce048868a7a914fd343cc3a87dd74291"
--"      ffc565506d5bbb25cbac6a0e2dd1f8bcaab0d4a29c2f37c950f363484bf269f7"
--"      891440464baf79827e03a36e70b814938eebdc63e964247be75dc58b014b7ea251#)"
-+"  (n #00c9d56d9d90db43d602ed9688138ab2bf6ea10610b27837a714a8ffdd00"
-+"      ddb493a045cc9690edada9ddc4d6ca0cf0ed4f725e21499a1812158f905a"
-+"      dbb63399a3e6b4f0c4972126bbe3baf2ffa072da89638e8b3e089d922abe"
-+"      16e14315fc57c71f0911671ca996d18b3e8093c159d06d39f2ac95cc1075"
-+"      e93124d143af68524be716d749656f26c086adc0070ac1e12f8785863bdc"
-+"      5a99bee9f9b9e98227510415ab060e765a288d92bdc5b57ba8df4e47a2c1"
-+"      e752bf47f762e03a6f4d6a4d4ed4b95969fab214c1eee62f95cd9472aee4"
-+"      db189ac4cd70bdee3116b74965ac40190eb56d83f136bb082f2e4e9262a4"
-+"      ff50db2045a2eb167af2d528c1fd4e0371#)"
- "  (e #010001#)"
--"  (d #046129f2489d71579be0a75fe029bd6cdb574ebf57ea8a5b0fda942cab943b11"
--"      7d7bb95e5d28875e0f9fc5fcc06a72f6d502464dabded78ef6b716177b83d5bd"
--"      c543dc5d3fed932e59f5897e92e6f58a0f33424106a3b6fa2cbf877510e4ac21"
--"      c3ee47851e97d12996222ac3566d4ccb0b83d164074abf7de655fc2446da1781#)"
--"  (p #00e861b700e17e8afe6837e7512e35b6ca11d0ae47d8b85161c67baf64377213"
--"      fe52d772f2035b3ca830af41d8a4120e1c1c70d12cc22f00d28d31dd48a8d424f1#)"
--"  (q #00f7a7ca5367c661f8e62df34f0d05c10c88e5492348dd7bddc942c9a8f369f9"
--"      35a07785d2db805215ed786e4285df1658eed3ce84f469b81b50d358407b4ad361#)"
--"  (u #304559a9ead56d2309d203811a641bb1a09626bc8eb36fffa23c968ec5bd891e"
--"      ebbafc73ae666e01ba7c8990bae06cc2bbe10b75e69fcacb353a6473079d8e9b#)))";
--/* A sample 1024 bit RSA key used for the selftests (public only).  */
-+"  (d #03b1e24a94e50ab21f8619701ec97679be2cf8f733c9331d9e2974dba721"
-+"      27e5def480290e78a769f96b19d28397a284868fb614ca9b1fb3a0d7efed"
-+"      df41451204ce71aceba659f6ed15964ebb317712364e1cfaf2fded77d658"
-+"      8561acc49c97c2d7efe75f1534b35bd4f6561e1f468b45590db34553d4d0"
-+"      c2cb4d806b74e1b2c52740462538865d9792b0aefbbf7b9827f4b3badcb3"
-+"      5adab638266a2d2fb8422a7a19142e08848e56af77a66c39b2afafa2e15b"
-+"      1a7e4ed1f2c7ed350678c0465d86472af97371b13ef5058662f835ef9087"
-+"      f6cca8281bbf1b6b155c737b33d9e443350df85e7cc3b507231fb839f41f"
-+"      02c654b29017f35d69007c70e13ba0e5#)"
-+"  (p #00ccbe7b096906ee45bf884738a8f817e5b6ba6755e3e8058bb8e253d68e"
-+"      ef2ce74f4af74e268d850b3fecc31cd4ebec6ac8722a257dfda67796f01e"
-+"      cd2857f83730756bbdd47b0c87c56c8740a5bb272c78c9745a545b0b306f"
-+"      444afa71e4216166f9ee65de7c04d7fda9155b7fe27aba698672a6068d9b"
-+"      9055609e4c5da9b655#)"
-+"  (q #00fc5c6e16ce1f037bcdf7b372b28f1672b856aef7cd67d84e7d07afd543"
-+"      26c335be438f4e2f1c434e6bd2b2ec526d97522bcc5c3a6bf414c674da66"
-+"      381c7a3f842fe3f95ab865694606a33779b2a15b58ed5ea75f8c6566bbd1"
-+"      2436e637a73d49778a8c34d86929f34d5822b05124b640a886590ab7ba5c"
-+"      97da57e836da7a9cad#)"
-+"  (u #2396c191175e0a83d2dc7b69b2591d3358523f18c709501cb9a1bb4ca238"
-+"      404c9a8efe9c9092d0719f899950911f348b745311114a70e2f730d88c80"
-+"      e1cc9ff163171a7d67294ccb4e747be03e9e2ff4678fecb95c001e7ea27b"
-+"      92c96f4ce40ef94863cd50225dbfb69d01336af450be86984fca3f3afacf"
-+"      0740c4aaadaebebf#)))";
-+/* A sample 2048 bit RSA key used for the selftests (public only).  */
- static const char sample_public_key[] =
- "(public-key"
- " (rsa"
--"  (n #00e0ce96f90b6c9e02f3922beada93fe50a875eac6bcc18bb9a9cf2e84965caa"
--"      2d1ff95a7f542465c6c0c19d276e4526ce048868a7a914fd343cc3a87dd74291"
--"      ffc565506d5bbb25cbac6a0e2dd1f8bcaab0d4a29c2f37c950f363484bf269f7"
--"      891440464baf79827e03a36e70b814938eebdc63e964247be75dc58b014b7ea251#)"
-+"  (n #00c9d56d9d90db43d602ed9688138ab2bf6ea10610b27837a714a8ffdd00"
-+"      ddb493a045cc9690edada9ddc4d6ca0cf0ed4f725e21499a1812158f905a"
-+"      dbb63399a3e6b4f0c4972126bbe3baf2ffa072da89638e8b3e089d922abe"
-+"      16e14315fc57c71f0911671ca996d18b3e8093c159d06d39f2ac95cc1075"
-+"      e93124d143af68524be716d749656f26c086adc0070ac1e12f8785863bdc"
-+"      5a99bee9f9b9e98227510415ab060e765a288d92bdc5b57ba8df4e47a2c1"
-+"      e752bf47f762e03a6f4d6a4d4ed4b95969fab214c1eee62f95cd9472aee4"
-+"      db189ac4cd70bdee3116b74965ac40190eb56d83f136bb082f2e4e9262a4"
-+"      ff50db2045a2eb167af2d528c1fd4e0371#)"
- "  (e #010001#)))";
- 
- 
-@@ -1610,20 +1634,35 @@ compute_keygrip (gcry_md_hd_t md, gcry_s
-  */
- 
- static const char *
--selftest_sign_1024 (gcry_sexp_t pkey, gcry_sexp_t skey)
-+selftest_sign (gcry_sexp_t pkey, gcry_sexp_t skey)
- {
-   static const char sample_data[] =
-     "(data (flags pkcs1)"
--    " (hash sha1 #11223344556677889900aabbccddeeff10203040#))";
-+    " (hash sha256 #11223344556677889900aabbccddeeffa0b0c0d0102030405060708090a1b1c1#))";
-   static const char sample_data_bad[] =
-     "(data (flags pkcs1)"
--    " (hash sha1 #11223344556677889900aabbccddeeff80203040#))";
-+    " (hash sha256 #11223344556677889900aabbccddeeffa0b0c0d0102030405060708091a1b1c1#))";
-+  static const char signature_ka[] =
-+    "(sig-val \n"
-+    " (rsa \n"
-+    "  (s #0B12D55738B099D401C81BEEDA54E045B4B7D9CDA5A8769E9C484F696A58912A"
-+          "1E5DE7E5A2D181DA15A5C254D802AB75F1056E27406850AC7BE310BC32D2CED8"
-+          "6697FE84508F7EFFF4D147C52E955A0873EF2F52ED71F2FC9C3C12D4045CB643"
-+          "70158378E1494D8FBAD2248B9B64233D2CC2C1932B0531E539DEB07434B76D3B"
-+          "6959E8A37E33B234C0C8C2C8FB1D00939239C9C491B2EBEED77BF952B597E11B"
-+          "D4ED0C103D2B88BC78B4E505CF9D8D08B585CE3688D4FBE83ED58D1E1341AC4D"
-+          "7C5EFF3CBC565CC7AE61C2F568426763A5239D31C1FFFD366984901679A343C4"
-+          "01BB778BBA5E533B7875BA658A19AA9E56170F4A28E4322BF1621175FB06463E#)\n"
-+    "  )\n"
-+    " )\n";
- 
-   const char *errtxt = NULL;
-   gcry_error_t err;
-   gcry_sexp_t data = NULL;
-   gcry_sexp_t data_bad = NULL;
-   gcry_sexp_t sig = NULL;
-+  char buf[1024];
-+  size_t len;
- 
-   err = sexp_sscan (&data, NULL, sample_data, strlen (sample_data));
-   if (!err)
-@@ -1641,6 +1680,12 @@ selftest_sign_1024 (gcry_sexp_t pkey, gc
-       errtxt = "signing failed";
-       goto leave;
-     }
-+  len = sexp_sprint (sig, GCRYSEXP_FMT_ADVANCED, buf, sizeof(buf));
-+  if (len != sizeof (signature_ka) - 1 || memcmp (buf, signature_ka, len) != 0)
-+    {
-+      errtxt = "signature KAT failed";
-+      goto leave;
-+    }
-   err = _gcry_pk_verify (sig, data, pkey);
-   if (err)
-     {
-@@ -1697,11 +1742,11 @@ extract_a_from_sexp (gcry_sexp_t encr_da
- 
- 
- static const char *
--selftest_encr_1024 (gcry_sexp_t pkey, gcry_sexp_t skey)
-+selftest_encr (gcry_sexp_t pkey, gcry_sexp_t skey)
- {
-   const char *errtxt = NULL;
-   gcry_error_t err;
--  const unsigned int nbits = 1000; /* Encrypt 1000 random bits.  */
-+  const unsigned int nbits = 2000; /* Encrypt 2000 random bits.  */
-   gcry_mpi_t plaintext = NULL;
-   gcry_sexp_t plain = NULL;
-   gcry_sexp_t encr  = NULL;
-@@ -1822,12 +1867,12 @@ selftests_rsa (selftest_report_func_t re
-     }
- 
-   what = "sign";
--  errtxt = selftest_sign_1024 (pkey, skey);
-+  errtxt = selftest_sign (pkey, skey);
-   if (errtxt)
-     goto failed;
- 
-   what = "encrypt";
--  errtxt = selftest_encr_1024 (pkey, skey);
-+  errtxt = selftest_encr (pkey, skey);
-   if (errtxt)
-     goto failed;
- 
-diff -up libgcrypt-1.6.2/random/drbg.c.fips-reqs libgcrypt-1.6.2/random/drbg.c
-diff -up libgcrypt-1.6.2/src/visibility.c.fips-reqs libgcrypt-1.6.2/src/visibility.c
---- libgcrypt-1.6.2/src/visibility.c.fips-reqs	2014-08-21 14:50:39.000000000 +0200
-+++ libgcrypt-1.6.2/src/visibility.c	2014-12-08 17:23:06.530943221 +0100
-@@ -1259,6 +1259,8 @@ gcry_kdf_derive (const void *passphrase,
-                  unsigned long iterations,
-                  size_t keysize, void *keybuffer)
- {
-+  if (!fips_is_operational ())
-+    return gpg_error (fips_not_operational ());
-   return gpg_error (_gcry_kdf_derive (passphrase, passphraselen, algo, hashalgo,
-                                       salt, saltlen, iterations,
-                                       keysize, keybuffer));
-@@ -1314,6 +1316,13 @@ void
- gcry_mpi_randomize (gcry_mpi_t w,
-                     unsigned int nbits, enum gcry_random_level level)
- {
-+  if (!fips_is_operational ())
-+    {
-+      (void)fips_not_operational ();
-+      fips_signal_fatal_error ("called in non-operational state");
-+      fips_noreturn ();
-+    }
-+
-   _gcry_mpi_randomize (w, nbits, level);
- }
- 
-@@ -1339,6 +1348,8 @@ gcry_prime_generate (gcry_mpi_t *prime,
-                      gcry_random_level_t random_level,
-                      unsigned int flags)
- {
-+  if (!fips_is_operational ())
-+    return gpg_error (fips_not_operational ());
-   return gpg_error (_gcry_prime_generate (prime, prime_bits, factor_bits,
-                                           factors, cb_func, cb_arg,
-                                           random_level, flags));

libgcrypt-1.6.2-fips-test.patch

@@ -1,18 +0,0 @@
-diff -up libgcrypt-1.6.2/tests/basic.c.fips-test libgcrypt-1.6.2/tests/basic.c
---- libgcrypt-1.6.2/tests/basic.c.fips-test	2014-08-21 14:50:39.000000000 +0200
-+++ libgcrypt-1.6.2/tests/basic.c	2014-12-08 16:54:07.767619682 +0100
-@@ -582,6 +582,14 @@ check_ctr_cipher (void)
-       if (!tv[i].algo)
-         continue;
- 
-+      if (gcry_cipher_test_algo (tv[i].algo) && in_fips_mode)
-+        {
-+          if (verbose)
-+            fprintf (stderr, "  algorithm %d not available in fips mode\n",
-+                     tv[i].algo);
-+          continue;
-+        }
-+
-       err = gcry_cipher_open (&hde, tv[i].algo, GCRY_CIPHER_MODE_CTR, 0);
-       if (!err)
- 	err = gcry_cipher_open (&hdd, tv[i].algo, GCRY_CIPHER_MODE_CTR, 0);

libgcrypt-1.6.2-use-fipscheck.patch

@@ -1,87 +0,0 @@
-diff -up libgcrypt-1.6.2/src/fips.c.use-fipscheck libgcrypt-1.6.2/src/fips.c
---- libgcrypt-1.6.2/src/fips.c.use-fipscheck	2014-08-21 14:50:39.000000000 +0200
-+++ libgcrypt-1.6.2/src/fips.c	2014-09-26 11:42:20.999588282 +0200
-@@ -578,23 +578,48 @@ run_random_selftests (void)
-   return !!err;
- }
- 
-+static int
-+get_library_path(const char *libname, const char *symbolname, char *path, size_t pathlen)
-+{
-+    Dl_info info;
-+    void *dl, *sym;
-+    int rv = -1;
-+
-+        dl = dlopen(libname, RTLD_LAZY);
-+        if (dl == NULL) {
-+            return -1;
-+        }       
-+
-+    sym = dlsym(dl, symbolname);
-+
-+    if (sym != NULL && dladdr(sym, &info)) {
-+	strncpy(path, info.dli_fname, pathlen-1);
-+	path[pathlen-1] = '\0';
-+	rv = 0;
-+    }
-+
-+    dlclose(dl);	
-+    
-+    return rv;
-+}
-+
- /* Run an integrity check on the binary.  Returns 0 on success.  */
- static int
- check_binary_integrity (void)
- {
- #ifdef ENABLE_HMAC_BINARY_CHECK
-   gpg_error_t err;
--  Dl_info info;
-+  char libpath[4096];
-   unsigned char digest[32];
-   int dlen;
-   char *fname = NULL;
--  const char key[] = "What am I, a doctor or a moonshuttle conductor?";
--
--  if (!dladdr ("gcry_check_version", &info))
-+  const char key[] = "orboDeJITITejsirpADONivirpUkvarP";
-+  
-+  if (get_library_path ("libgcrypt.so.20", "gcry_check_version", libpath, sizeof(libpath)))
-     err = gpg_error_from_syserror ();
-   else
-     {
--      dlen = _gcry_hmac256_file (digest, sizeof digest, info.dli_fname,
-+      dlen = _gcry_hmac256_file (digest, sizeof digest, libpath,
-                                  key, strlen (key));
-       if (dlen < 0)
-         err = gpg_error_from_syserror ();
-@@ -602,7 +627,7 @@ check_binary_integrity (void)
-         err = gpg_error (GPG_ERR_INTERNAL);
-       else
-         {
--          fname = xtrymalloc (strlen (info.dli_fname) + 1 + 5 + 1 );
-+          fname = xtrymalloc (strlen (libpath) + 1 + 5 + 1 );
-           if (!fname)
-             err = gpg_error_from_syserror ();
-           else
-@@ -611,7 +636,7 @@ check_binary_integrity (void)
-               char *p;
- 
-               /* Prefix the basename with a dot.  */
--              strcpy (fname, info.dli_fname);
-+              strcpy (fname, libpath);
-               p = strrchr (fname, '/');
-               if (p)
-                 p++;
-diff -up libgcrypt-1.6.2/src/Makefile.in.use-fipscheck libgcrypt-1.6.2/src/Makefile.in
---- libgcrypt-1.6.2/src/Makefile.in.use-fipscheck	2014-08-21 15:14:08.000000000 +0200
-+++ libgcrypt-1.6.2/src/Makefile.in	2014-09-26 11:41:13.271059281 +0200
-@@ -449,7 +449,7 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \
- 	../cipher/libcipher.la \
- 	../random/librandom.la \
- 	../mpi/libmpi.la \
--	../compat/libcompat.la  $(GPG_ERROR_LIBS)
-+	../compat/libcompat.la  $(GPG_ERROR_LIBS) -ldl
- 
- dumpsexp_SOURCES = dumpsexp.c
- dumpsexp_CFLAGS = $(arch_gpg_error_cflags)

libgcrypt-1.6.3-aliasing.patch

@@ -1,177 +0,0 @@
-diff -up libgcrypt-1.6.3/cipher/bufhelp.h.aliasing libgcrypt-1.6.3/cipher/bufhelp.h
---- libgcrypt-1.6.3/cipher/bufhelp.h.aliasing	2015-02-27 10:54:03.000000000 +0100
-+++ libgcrypt-1.6.3/cipher/bufhelp.h	2015-03-13 15:03:43.301749751 +0100
-@@ -80,7 +80,7 @@ do_bytes:
-   for (; len; len--)
-     *dst++ = *src++;
- #endif /*__GNUC__ >= 4 && (__x86_64__ || __i386__)*/
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- 
- /* Optimized function for buffer xoring */
-@@ -117,7 +117,7 @@ do_bytes:
-   /* Handle tail.  */
-   for (; len; len--)
-     *dst++ = *src1++ ^ *src2++;
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- 
- /* Optimized function for buffer xoring with two destination buffers.  Used
-@@ -155,7 +155,7 @@ do_bytes:
-   /* Handle tail.  */
-   for (; len; len--)
-     *dst1++ = (*dst2++ ^= *src++);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- 
- /* Optimized function for combined buffer xoring and copying.  Used by mainly
-@@ -208,7 +208,7 @@ do_bytes:
-       *dst_xor++ = *srcdst_cpy ^ *src_xor++;
-       *srcdst_cpy++ = temp;
-     }
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- 
- /* Optimized function for combined buffer xoring and copying.  Used by mainly
-@@ -234,7 +234,7 @@ buf_eq_const(const void *_a, const void
-     diff -= !!(a[i] - b[i]);
- 
-   return !diff;
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- 
- #ifndef BUFHELP_FAST_UNALIGNED_ACCESS
-@@ -246,14 +246,14 @@ static inline u32 buf_get_be32(const voi
-   const byte *in = _buf;
-   return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \
-          ((u32)in[2] << 8) | (u32)in[3];
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline u32 buf_get_le32(const void *_buf)
- {
-   const byte *in = _buf;
-   return ((u32)in[3] << 24) | ((u32)in[2] << 16) | \
-          ((u32)in[1] << 8) | (u32)in[0];
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_be32(void *_buf, u32 val)
- {
-@@ -262,7 +262,7 @@ static inline void buf_put_be32(void *_b
-   out[1] = val >> 16;
-   out[2] = val >> 8;
-   out[3] = val;
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_le32(void *_buf, u32 val)
- {
-@@ -271,7 +271,7 @@ static inline void buf_put_le32(void *_b
-   out[2] = val >> 16;
-   out[1] = val >> 8;
-   out[0] = val;
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- #ifdef HAVE_U64_TYPEDEF
- /* Functions for loading and storing unaligned u64 values of different
-@@ -283,7 +283,7 @@ static inline u64 buf_get_be64(const voi
-          ((u64)in[2] << 40) | ((u64)in[3] << 32) | \
-          ((u64)in[4] << 24) | ((u64)in[5] << 16) | \
-          ((u64)in[6] << 8) | (u64)in[7];
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline u64 buf_get_le64(const void *_buf)
- {
-@@ -292,7 +292,7 @@ static inline u64 buf_get_le64(const voi
-          ((u64)in[5] << 40) | ((u64)in[4] << 32) | \
-          ((u64)in[3] << 24) | ((u64)in[2] << 16) | \
-          ((u64)in[1] << 8) | (u64)in[0];
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_be64(void *_buf, u64 val)
- {
-@@ -305,7 +305,7 @@ static inline void buf_put_be64(void *_b
-   out[5] = val >> 16;
-   out[6] = val >> 8;
-   out[7] = val;
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_le64(void *_buf, u64 val)
- {
-@@ -318,7 +318,7 @@ static inline void buf_put_le64(void *_b
-   out[2] = val >> 16;
-   out[1] = val >> 8;
-   out[0] = val;
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- #endif /*HAVE_U64_TYPEDEF*/
- 
- #else /*BUFHELP_FAST_UNALIGNED_ACCESS*/
-@@ -328,24 +328,24 @@ static inline void buf_put_le64(void *_b
- static inline u32 buf_get_be32(const void *_buf)
- {
-   return be_bswap32(*(const u32 *)_buf);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline u32 buf_get_le32(const void *_buf)
- {
-   return le_bswap32(*(const u32 *)_buf);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_be32(void *_buf, u32 val)
- {
-   u32 *out = _buf;
-   *out = be_bswap32(val);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_le32(void *_buf, u32 val)
- {
-   u32 *out = _buf;
-   *out = le_bswap32(val);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- #ifdef HAVE_U64_TYPEDEF
- /* Functions for loading and storing unaligned u64 values of different
-@@ -353,24 +353,24 @@ static inline void buf_put_le32(void *_b
- static inline u64 buf_get_be64(const void *_buf)
- {
-   return be_bswap64(*(const u64 *)_buf);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline u64 buf_get_le64(const void *_buf)
- {
-   return le_bswap64(*(const u64 *)_buf);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_be64(void *_buf, u64 val)
- {
-   u64 *out = _buf;
-   *out = be_bswap64(val);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- 
- static inline void buf_put_le64(void *_buf, u64 val)
- {
-   u64 *out = _buf;
-   *out = le_bswap64(val);
--}
-+} __attribute__ ((optimize("no-strict-aliasing")))
- #endif /*HAVE_U64_TYPEDEF*/
- 
- #endif /*BUFHELP_FAST_UNALIGNED_ACCESS*/

libgcrypt-1.6.3-rsa-fips-keygen.patch

@@ -1,378 +0,0 @@
-diff -up libgcrypt-1.6.3/cipher/primegen.c.fips-keygen libgcrypt-1.6.3/cipher/primegen.c
---- libgcrypt-1.6.3/cipher/primegen.c.fips-keygen	2015-03-06 16:38:56.698052602 +0100
-+++ libgcrypt-1.6.3/cipher/primegen.c	2015-03-06 16:45:45.848193024 +0100
-@@ -1199,6 +1199,25 @@ _gcry_prime_check (gcry_mpi_t x, unsigne
-   return GPG_ERR_NO_PRIME;
- }
- 
-+/* Check whether the number X is prime according to FIPS 186-4 table C.2.  */
-+gcry_err_code_t
-+_gcry_fips186_4_prime_check (gcry_mpi_t x, unsigned int bits)
-+{
-+  gcry_err_code_t ec = GPG_ERR_NO_ERROR;
-+
-+  switch (mpi_cmp_ui (x, 2))
-+    {
-+    case 0:  return ec;                /* 2 is a prime */
-+    case -1: return GPG_ERR_NO_PRIME; /* Only numbers > 1 are primes.  */
-+    }
-+
-+  /* We use 5 or 4 rounds as specified in table C.2 */
-+  if (! check_prime (x, mpi_const (MPI_C_TWO), bits > 1024 ? 4 : 5, NULL, NULL))
-+    ec = GPG_ERR_NO_PRIME;
-+
-+  return ec;
-+}
-+
- /* Find a generator for PRIME where the factorization of (prime-1) is
-    in the NULL terminated array FACTORS. Return the generator as a
-    newly allocated MPI in R_G.  If START_G is not NULL, use this as s
-diff -up libgcrypt-1.6.3/cipher/rsa.c.fips-keygen libgcrypt-1.6.3/cipher/rsa.c
---- libgcrypt-1.6.3/cipher/rsa.c.fips-keygen	2015-03-06 16:38:56.661052411 +0100
-+++ libgcrypt-1.6.3/cipher/rsa.c	2015-03-06 16:38:56.699052607 +0100
-@@ -339,6 +339,279 @@ generate_std (RSA_secret_key *sk, unsign
- }
- 
- 
-+/****************
-+ * Generate a key pair with a key of size NBITS.
-+ * USE_E = 0 let Libcgrypt decide what exponent to use.
-+ *       = 1 request the use of a "secure" exponent; this is required by some
-+ *           specification to be 65537.
-+ *       > 2 Use this public exponent.  If the given exponent
-+ *           is not odd one is internally added to it.
-+ * TESTPARMS: If set, do not generate but test whether the p,q is probably prime
-+ *            Returns key with zeroes to not break code calling this function.
-+ * TRANSIENT_KEY:  If true, generate the primes using the standard RNG.
-+ * Returns: 2 structures filled with all needed values
-+ */
-+static gpg_err_code_t
-+generate_fips (RSA_secret_key *sk, unsigned int nbits, unsigned long use_e,
-+               gcry_sexp_t testparms, int transient_key)
-+{
-+  gcry_mpi_t p, q; /* the two primes */
-+  gcry_mpi_t d;    /* the private key */
-+  gcry_mpi_t u;
-+  gcry_mpi_t p1, q1;
-+  gcry_mpi_t n;    /* the public key */
-+  gcry_mpi_t e;    /* the exponent */
-+  gcry_mpi_t g;
-+  gcry_mpi_t minp;
-+  gcry_mpi_t diff, mindiff;
-+  gcry_random_level_t random_level;
-+  unsigned int pbits = nbits/2;
-+  unsigned int i;
-+  int pqswitch;
-+  gpg_err_code_t ec = GPG_ERR_NO_PRIME;
-+
-+  if (nbits < 1024 || (nbits & 0x1FF))
-+      return GPG_ERR_INV_VALUE;
-+  if (_gcry_enforced_fips_mode() && nbits != 2048 && nbits != 3072)
-+      return GPG_ERR_INV_VALUE;
-+
-+  /* The random quality depends on the transient_key flag.  */
-+  random_level = transient_key ? GCRY_STRONG_RANDOM : GCRY_VERY_STRONG_RANDOM;
-+
-+  if (testparms)
-+      {
-+        /* Parameters to derive the key are given.  */
-+        /* Note that we explicitly need to setup the values of tbl
-+           because some compilers (e.g. OpenWatcom, IRIX) don't allow
-+           to initialize a structure with automatic variables.  */
-+        struct { const char *name; gcry_mpi_t *value; } tbl[] = {
-+          { "e" },
-+          { "p" },
-+          { "q" },
-+          { NULL }
-+        };
-+        int idx;
-+        gcry_sexp_t oneparm;
-+
-+        tbl[0].value = &e;
-+        tbl[1].value = &p;
-+        tbl[2].value = &q;
-+
-+        for (idx=0; tbl[idx].name; idx++)
-+          {
-+            oneparm = sexp_find_token (testparms, tbl[idx].name, 0);
-+            if (oneparm)
-+              {
-+                *tbl[idx].value = sexp_nth_mpi (oneparm, 1,
-+                                                     GCRYMPI_FMT_USG);
-+                sexp_release (oneparm);
-+              }
-+          }
-+        for (idx=0; tbl[idx].name; idx++)
-+          if (!*tbl[idx].value)
-+            break;
-+        if (tbl[idx].name)
-+          {
-+            /* At least one parameter is missing.  */
-+            for (idx=0; tbl[idx].name; idx++)
-+              _gcry_mpi_release (*tbl[idx].value);
-+            return GPG_ERR_MISSING_VALUE;
-+          }
-+      }
-+  else
-+      {
-+        if (use_e < 65537)
-+          use_e = 65537;  /* This is the smallest value allowed by FIPS */
-+
-+        e = mpi_alloc( (32+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
-+
-+        use_e |= 1; /* make sure this is odd */
-+        mpi_set_ui (e, use_e);
-+
-+        p = mpi_snew (pbits);
-+        q = mpi_snew (pbits);
-+      }
-+
-+  n = mpi_new (nbits);
-+  d = mpi_snew (nbits);
-+  u = mpi_snew (nbits);
-+
-+  /* prepare approximate minimum p and q */
-+  minp = mpi_new (pbits);
-+  mpi_set_ui (minp, 0xB504F334);
-+  mpi_lshift (minp, minp, pbits - 32); 
-+
-+  /* prepare minimum p and q difference */
-+  diff = mpi_new (pbits);
-+  mindiff = mpi_new (pbits - 99);
-+  mpi_set_ui (mindiff, 1);
-+  mpi_lshift (mindiff, mindiff, pbits - 100);
-+
-+  p1 = mpi_snew (pbits);
-+  q1 = mpi_snew (pbits);
-+  g  = mpi_snew (pbits);
-+
-+retry:
-+  /* generate p and q */
-+  for (i = 0; i < 5 * pbits; i++)
-+    {
-+    ploop:
-+      if (!testparms)
-+        {
-+          _gcry_mpi_randomize (p, pbits, random_level);
-+        }
-+      if (mpi_cmp (p, minp) < 0)
-+        {
-+          if (testparms) goto err;
-+          goto ploop;
-+        }
-+
-+      mpi_sub_ui (p1, p, 1);
-+      if (mpi_gcd (g, p1, e))
-+        {
-+          if (_gcry_fips186_4_prime_check (p, pbits) != GPG_ERR_NO_ERROR)
-+            {
-+              /* not a prime */
-+              if (testparms) goto err;
-+            }
-+          else
-+            break;
-+        } 
-+      else if (testparms) goto err;
-+    }
-+  if (i >= 5 * pbits)
-+    goto err;
-+
-+  for (i = 0; i < 5 * pbits; i++)
-+    {
-+    qloop:
-+      if (!testparms)
-+        {
-+          _gcry_mpi_randomize (q, pbits, random_level);
-+        }
-+      if (mpi_cmp (q, minp) < 0)
-+        {
-+          if (testparms) goto err;
-+          goto qloop;
-+        }
-+      if (mpi_cmp (p, q) > 0)
-+        {
-+          pqswitch = 1;
-+          mpi_sub (diff, p, q);
-+        }
-+      else
-+        {
-+          pqswitch = 0;
-+          mpi_sub (diff, q, p);
-+        }
-+      if (mpi_cmp (diff, mindiff) < 0)
-+        {
-+          if (testparms) goto err;
-+          goto qloop;
-+        }
-+
-+      mpi_sub_ui (q1, q, 1);
-+      if (mpi_gcd (g, q1, e))
-+        {
-+          if (_gcry_fips186_4_prime_check (q, pbits) != GPG_ERR_NO_ERROR)
-+            {
-+              /* not a prime */
-+              if (testparms) goto err;
-+            }
-+          else
-+            break;
-+        }
-+      else if (testparms) goto err;
-+    }
-+  if (i >= 5 * pbits)
-+    goto err;
-+
-+  if (testparms)
-+    {
-+       mpi_clear (p);
-+       mpi_clear (q);
-+    }
-+  else
-+    {
-+      gcry_mpi_t f;
-+
-+      if (pqswitch)
-+        {
-+          gcry_mpi_t tmp;
-+
-+          tmp = p;
-+          p = q;
-+          q = tmp;
-+        }
-+
-+      f = mpi_snew (nbits);
-+
-+      /* calculate the modulus */
-+      mpi_mul(n, p, q);
-+
-+      /* calculate the secret key d = e^1 mod phi */
-+      mpi_gcd (g, p1, q1);
-+      mpi_fdiv_q (f, p1, g);
-+      mpi_mul (f, f, q1);
-+
-+      mpi_invm (d, e, f);
-+
-+      _gcry_mpi_release (f);
-+
-+      if (mpi_get_nbits (d) < pbits) goto retry;
-+
-+      /* calculate the inverse of p and q (used for chinese remainder theorem)*/
-+      mpi_invm(u, p, q );
-+    }
-+
-+  ec = 0;
-+
-+  if( DBG_CIPHER )
-+    {
-+      log_mpidump("  p= ", p );
-+      log_mpidump("  q= ", q );
-+      log_mpidump("  n= ", n );
-+      log_mpidump("  e= ", e );
-+      log_mpidump("  d= ", d );
-+      log_mpidump("  u= ", u );
-+    }
-+
-+err:
-+
-+  _gcry_mpi_release (p1);
-+  _gcry_mpi_release (q1);
-+  _gcry_mpi_release (g);
-+  _gcry_mpi_release (minp);
-+  _gcry_mpi_release (mindiff);
-+  _gcry_mpi_release (diff);
-+
-+  sk->n = n;
-+  sk->e = e;
-+  sk->p = p;
-+  sk->q = q;
-+  sk->d = d;
-+  sk->u = u;
-+
-+  /* Now we can test our keys. */
-+  if (ec || (!testparms && test_keys (sk, nbits - 64)))
-+    {
-+      _gcry_mpi_release (sk->n); sk->n = NULL;
-+      _gcry_mpi_release (sk->e); sk->e = NULL;
-+      _gcry_mpi_release (sk->p); sk->p = NULL;
-+      _gcry_mpi_release (sk->q); sk->q = NULL;
-+      _gcry_mpi_release (sk->d); sk->d = NULL;
-+      _gcry_mpi_release (sk->u); sk->u = NULL;
-+      if (!ec)
-+        {
-+          fips_signal_error ("self-test after key generation failed");
-+          return GPG_ERR_SELFTEST_FAILED;
-+        }
-+    }
-+
-+  return ec;
-+}
-+
-+
- /* Helper for generate_x931.  */
- static gcry_mpi_t
- gen_x931_parm_xp (unsigned int nbits)
-@@ -799,7 +1072,7 @@ rsa_generate (const gcry_sexp_t genparms
-         }
-     }
- 
--  if (deriveparms || (flags & PUBKEY_FLAG_USE_X931) || fips_mode ())
-+  if (deriveparms || (flags & PUBKEY_FLAG_USE_X931))
-     {
-       int swapped;
-       ec = generate_x931 (&sk, nbits, evalue, deriveparms, &swapped);
-@@ -819,9 +1092,14 @@ rsa_generate (const gcry_sexp_t genparms
-               sexp_release (l1);
-             }
-         }
-+      deriveparms = (genparms?
-+                 sexp_find_token (genparms, "test-parms", 0) : NULL);
-       /* Generate.  */
--      ec = generate_std (&sk, nbits, evalue,
--                         !!(flags & PUBKEY_FLAG_TRANSIENT_KEY));
-+      if (deriveparms || fips_mode())
-+        ec = generate_fips (&sk, nbits, evalue, deriveparms, !!(flags & PUBKEY_FLAG_TRANSIENT_KEY));
-+      else
-+        ec = generate_std (&sk, nbits, evalue, !!(flags & PUBKEY_FLAG_TRANSIENT_KEY));
-+      sexp_release (deriveparms);
-     }
- 
-   if (!ec)
-diff -up libgcrypt-1.6.3/src/g10lib.h.fips-keygen libgcrypt-1.6.3/src/g10lib.h
---- libgcrypt-1.6.3/src/g10lib.h.fips-keygen	2015-02-23 11:55:58.000000000 +0100
-+++ libgcrypt-1.6.3/src/g10lib.h	2015-03-06 16:38:56.699052607 +0100
-@@ -259,6 +259,9 @@ gpg_err_code_t _gcry_generate_fips186_3_
-                   int *r_counter,
-                   void **r_seed, size_t *r_seedlen, int *r_hashalgo);
- 
-+gpg_err_code_t _gcry_fips186_4_prime_check
-+                 (const gcry_mpi_t x, unsigned int bits);
-+
- 
- /* Replacements of missing functions (missing-string.c).  */
- #ifndef HAVE_STPCPY
-diff -up libgcrypt-1.6.3/tests/keygen.c.fips-keygen libgcrypt-1.6.3/tests/keygen.c
---- libgcrypt-1.6.3/tests/keygen.c.fips-keygen	2015-03-06 16:38:56.661052411 +0100
-+++ libgcrypt-1.6.3/tests/keygen.c	2015-03-06 16:38:56.699052607 +0100
-@@ -215,12 +215,12 @@ check_rsa_keys (void)
- 
- 
-   if (verbose)
--    show ("creating 1024 bit RSA key with e=257\n");
-+    show ("creating 1024 bit RSA key with e=65539\n");
-   rc = gcry_sexp_new (&keyparm,
-                       "(genkey\n"
-                       " (rsa\n"
-                       "  (nbits 4:1024)\n"
--                      "  (rsa-use-e 3:257)\n"
-+                      "  (rsa-use-e 5:65539)\n"
-                       " ))", 0, 1);
-   if (rc)
-     die ("error creating S-expression: %s\n", gpg_strerror (rc));
-@@ -229,7 +229,7 @@ check_rsa_keys (void)
-   if (rc)
-     die ("error generating RSA key: %s\n", gpg_strerror (rc));
- 
--  check_generated_rsa_key (key, 257);
-+  check_generated_rsa_key (key, 65539);
-   gcry_sexp_release (key);
- 
-   if (verbose)

libgcrypt-1.6.3-urandom-only.patch

@@ -1,29 +0,0 @@
-diff -up libgcrypt-1.6.3/random/random-csprng.c.urandom-only libgcrypt-1.6.3/random/random-csprng.c
---- libgcrypt-1.6.3/random/random-csprng.c.urandom-only	2015-02-27 10:54:03.000000000 +0100
-+++ libgcrypt-1.6.3/random/random-csprng.c	2015-03-20 08:29:27.513113519 +0100
-@@ -1125,8 +1125,7 @@ getfnc_gather_random (void))(void (*)(co
-              enum random_origins, size_t, int);
- 
- #if USE_RNDLINUX
--  if ( !access (NAME_OF_DEV_RANDOM, R_OK)
--       && !access (NAME_OF_DEV_URANDOM, R_OK))
-+  if (!access (NAME_OF_DEV_URANDOM, R_OK))
-     {
-       fnc = _gcry_rndlinux_gather_random;
-       return fnc;
-diff -up libgcrypt-1.6.3/random/rndlinux.c.urandom-only libgcrypt-1.6.3/random/rndlinux.c
---- libgcrypt-1.6.3/random/rndlinux.c.urandom-only	2015-03-20 08:36:13.472098269 +0100
-+++ libgcrypt-1.6.3/random/rndlinux.c	2015-03-20 08:36:43.765097131 +0100
-@@ -178,7 +178,11 @@ _gcry_rndlinux_gather_random (void (*add
-     {
-       if (fd_random == -1)
-         {
--          fd_random = open_device (NAME_OF_DEV_RANDOM, (ever_opened & 1), 1);
-+          /* We try to open /dev/random first but in case the open fails
-+             we gracefully retry with /dev/urandom. */
-+          fd_random = open_device (NAME_OF_DEV_RANDOM, 0, 0);
-+          if (fd_random == -1)
-+            fd_random = open_device (NAME_OF_DEV_URANDOM, (ever_opened & 1), 1);
-           ever_opened |= 1;
-         }
-       fd = fd_random;

libgcrypt.spec

@@ -1,74 +1,50 @@
+# This is taken from gnutls.spec
+%define srpmhash() %{lua:
+local files = rpm.expand("%_specdir/libgcrypt.spec")
+for i, p in ipairs(patches) do
+   files = files.." "..p
+end
+for i, p in ipairs(sources) do
+   files = files.." "..p
+end
+local sha256sum = assert(io.popen("cat "..files.."| sha256sum"))
+local hash = sha256sum:read("*a")
+sha256sum:close()
+print(string.sub(hash, 0, 16))
+}
+
 Name: libgcrypt
-Version: 1.6.3
-Release: 4%{?dist}
-URL: http://www.gnupg.org/
-Source0: libgcrypt-%{version}-hobbled.tar.xz
-# The original libgcrypt sources now contain potentially patented ECC
-# cipher support. We have to remove it in the tarball we ship with
-# the hobble-libgcrypt script. 
-# (We replace it with RH approved ECC in Source4-5)
-#Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
-#Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
-Source2: wk@g10code.com
-Source3: hobble-libgcrypt
-# Approved ECC support (from 1.6.1)
-Source4: ecc-curves.c
-Source5: curves.c
-Source6: t-mpi-point.c
-# make FIPS hmac compatible with fipscheck - non upstreamable
-# update on soname bump
-Patch2: libgcrypt-1.6.2-use-fipscheck.patch
-# fix tests in the FIPS mode, fix the FIPS-186-3 DSA keygen
-Patch5: libgcrypt-1.6.1-tests.patch
-# add configurable source of RNG seed and seed by default
-# from /dev/urandom in the FIPS mode
-Patch6: libgcrypt-1.6.1-fips-cfgrandom.patch
-# update the CAVS tests
-Patch7: libgcrypt-1.6.2-fips-cavs.patch
-# fix for memory leaks an other errors found by Coverity scan
-Patch9: libgcrypt-1.6.1-leak.patch
-# use poll instead of select when gathering randomness
-Patch11: libgcrypt-1.6.1-use-poll.patch
-# slight optimalization of mpicoder.c to silence Valgrind (#968288)
-Patch13: libgcrypt-1.6.1-mpicoder-gccopt.patch
-# fix tests to work with approved ECC
-Patch14: libgcrypt-1.6.1-ecc-test-fix.patch
-# Replace the FIPS RNG with DRBG
-Patch15: libgcrypt-1.6.2-drbg.patch
-# Run the FIPS mode initialization in the shared library constructor
-Patch18: libgcrypt-1.6.2-fips-ctor.patch
-# Make it possible to run the test suite in the FIPS mode
-Patch19: libgcrypt-1.6.2-fips-test.patch
-# Make the FIPS RSA keygen to be FIPS 186-4 compliant
-Patch20: libgcrypt-1.6.3-rsa-fips-keygen.patch
-# update the selftests for new FIPS requirements
-Patch22: libgcrypt-1.6.2-fips-reqs.patch
-# do not use strict aliasing for bufhelp functions
-Patch23: libgcrypt-1.6.3-aliasing.patch
-# use only urandom if /dev/random cannot be opened
-Patch24: libgcrypt-1.6.3-urandom-only.patch
+Version: 1.11.2
+Release: 1%{?dist}
+URL: https://www.gnupg.org/
+Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
+Source1: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
+Source2: https://gnupg.org/signature_key.asc
+# Pass the annobin flags to the libgcrypt.so (#2016349)
+Patch1: libgcrypt-1.10.1-annobin.patch
+# https://gitlab.com/redhat-crypto/libgcrypt/libgcrypt-mirror/-/merge_requests/19/
+Patch5: libgcrypt-1.11.0-marvin.patch
 
-%define gcrylibdir %{_libdir}
+%global gcrylibdir %{_libdir}
+%global gcrysoname libgcrypt.so.20
+%global hmackey orboDeJITITejsirpADONivirpUkvarP
 
-# Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
-# Documentation and some utilities are GPLv2+ licensed. These files
-# are in the devel subpackage.
-License: LGPLv2+
+License: BSD-3-Clause AND (BSD-3-Clause OR GPL-2.0-only) AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND MIT-Modern-Variant
 Summary: A general-purpose cryptography library
+BuildRequires: gcc
 BuildRequires: gawk, libgpg-error-devel >= 1.11, pkgconfig
-BuildRequires: fipscheck
 # This is needed only when patching the .texi doc.
 BuildRequires: texinfo
-Group: System Environment/Libraries
+BuildRequires: autoconf, automake, libtool
+BuildRequires: make
+BuildRequires: gnupg2
+BuildRequires: annobin-annocheck binutils
 
 %package devel
 Summary: Development files for the %{name} package
-License: LGPLv2+ and GPLv2+
-Group: Development/Libraries
-Requires(pre): /sbin/install-info
-Requires(post): /sbin/install-info
 Requires: libgpg-error-devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
 
 %description
 Libgcrypt is a general purpose crypto library based on the code used
@@ -80,53 +56,59 @@ in GNU Privacy Guard.  This package contains files needed to develop
 applications using libgcrypt.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
-%{SOURCE3}
-%patch2 -p1 -b .use-fipscheck
-%patch5 -p1 -b .tests
-%patch6 -p1 -b .cfgrandom
-%patch7 -p1 -b .cavs
-%patch9 -p1 -b .leak
-%patch11 -p1 -b .use-poll
-%patch13 -p1 -b .gccopt
-%patch14 -p1 -b .eccfix
-%patch15 -p1 -b .drbg
-%patch18 -p1 -b .fips-ctor
-%patch19 -p1 -b .fips-test
-%patch20 -p1 -b .fips-keygen
-%patch22 -p1 -b .fips-reqs
-%patch23 -p1 -b .aliasing
-%patch24 -p1 -b .urandom-only
-
-cp %{SOURCE4} cipher/
-cp %{SOURCE5} %{SOURCE6} tests/
+%patch 1 -p1
+%patch 5 -p1
 
 %build
+# should be all algorithms except SM3 and SM4, aria
+export DIGESTS='crc gostr3411-94 md4 md5 rmd160 sha1 sha256 sha512 sha3 tiger whirlpool stribog blake2'
+export CIPHERS='arcfour blowfish cast5 des aes twofish serpent rfc2268 seed camellia idea salsa20 gost28147 chacha20'
+
+eval $(sed -n 's/^\(\(NAME\|VERSION_ID\)=.*\)/OS_\1/p' /etc/os-release)
+export FIPS_MODULE_NAME="$OS_NAME ${OS_VERSION_ID%%.*} %name"
+
+autoreconf -f
 %configure --disable-static \
 %ifarch sparc64
      --disable-asm \
 %endif
      --enable-noexecstack \
-     --enable-hmac-binary-check \
-     --enable-pubkey-ciphers='dsa elgamal rsa ecc' \
-     --disable-O-flag-munging
+     --enable-hmac-binary-check=%{hmackey} \
+     --disable-jent-support \
+     --disable-O-flag-munging \
+     --enable-digests="$DIGESTS" \
+     --enable-ciphers="$CIPHERS" \
+     --enable-marvin-workaround \
+     --with-fips-module-version="$FIPS_MODULE_NAME %{version}-%{srpmhash}"
 sed -i -e '/^sys_lib_dlsearch_path_spec/s,/lib /usr/lib,/usr/lib /lib64 /usr/lib64 /lib,g' libtool
-make %{?_smp_mflags}
+%make_build
 
 %check
-fipshmac src/.libs/libgcrypt.so.??
 make check
+# try in faked FIPS mode too
+LIBGCRYPT_FORCE_FIPS_MODE=1 make check
+
+%define libpath $RPM_BUILD_ROOT%{gcrylibdir}/%{gcrysoname}.?.?
+
+PROFILE=%{?dist} annocheck --ignore-unknown --verbose --profile=${PROFILE:1} %{libpath}
 
 # Add generation of HMAC checksums of the final stripped binaries 
 %define __spec_install_post \
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    fipshmac $RPM_BUILD_ROOT%{gcrylibdir}/*.so.?? \
+    cd src \
+    sed -i -e 's|FILE=.*|FILE=\\\$1|' gen-note-integrity.sh \
+    READELF=readelf AWK=awk ECHO_N="-n" bash gen-note-integrity.sh %{libpath} > %{libpath}.hmac \
+    objcopy --update-section .note.fdo.integrity=%{libpath}.hmac %{libpath} %{libpath}.new \
+    mv -f %{libpath}.new %{libpath} \
+    rm -f %{libpath}.hmac
 %{nil}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # Change /usr/lib64 back to /usr/lib.  This saves us from having to patch the
 # script to "know" that -L/usr/lib64 should be suppressed, and also removes
@@ -168,46 +150,259 @@ popd
 # that _someone_ owns it.
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/gcrypt
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post devel
-[ -f %{_infodir}/gcrypt.info.gz ] && \
-    /sbin/install-info %{_infodir}/gcrypt.info.gz %{_infodir}/dir
-exit 0
-
-%preun devel
-if [ $1 = 0 -a -f %{_infodir}/gcrypt.info.gz ]; then
-    /sbin/install-info --delete %{_infodir}/gcrypt.info.gz %{_infodir}/dir
-fi
-exit 0
+%ldconfig_scriptlets
 
 %files
-%defattr(-,root,root,-)
 %dir /etc/gcrypt
-%{gcrylibdir}/libgcrypt.so.*
-%{gcrylibdir}/.libgcrypt.so.*.hmac
-%{!?_licensedir:%global license %%doc}
+%{gcrylibdir}/libgcrypt.so.*.*
+%{gcrylibdir}/%{gcrysoname}
 %license COPYING.LIB
 %doc AUTHORS NEWS THANKS
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/%{name}-config
 %{_bindir}/dumpsexp
 %{_bindir}/hmac256
 %{_bindir}/mpicalc
 %{_includedir}/*
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/libgcrypt.pc
 %{_datadir}/aclocal/*
 %{_mandir}/man1/*
 
 %{_infodir}/gcrypt.info*
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 
 %changelog
+* Mon Nov 03 2025 Jakub Jelen <jjelen@redhat.com> - 1.11.2-1
+- New upstream release (#2406804)
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue May 13 2025 Jakub Jelen <jjelen@redhat.com> - 1.11.1-1
+- New upstream release (#2364878)
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Oct 29 2024 Jakub Jelen <jjelen@redhat.com> - 1.11.0-4
+- Run annocheck as part of the build
+- Use upstream CF protection patches
+- Fix PAC/BTI protection for Aarch64
+- Fix CVE-2024-2236 (#2274128)
+
+* Thu Jul 25 2024 Jakub Jelen <jjelen@redhat.com> - 1.11.0-3
+- Disable -O flag munging and remove needles modification of LTO flags.
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 19 2024 Jakub Jelen <jjelen@redhat.com> - 1.11.0-1
+- New upstream release (#2293064)
+
+* Tue Mar 26 2024 Jakub Jelen <jjelen@redhat.com> - 1.10.3-4
+- Replace deprecated fgrep (#2271503)
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Nov 14 2023 Jakub Jelen <jjelen@redhat.com> - 1.10.3-1
+- New upstream release (#2249639)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 11 2023 Jakub Jelen <jjelen@redhat.com> - 1.10.2-1
+- New upstream release (#2185084)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec  3 2022 Florian Weimer <fweimer@redhat.com> - 1.10.1-6
+- Port configure script to C99
+
+* Tue Nov 08 2022 Todd Zullinger <tmz@pobox.com> - 1.10.1-5
+- enable brainpool by default (#1413618)
+- fix sporadic failures generating RSA keys in FIPS mode
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun May 29 2022 Todd Zullinger <tmz@pobox.com> - 1.10.1-3
+- improve --disable-brainpool configure output
+- use %%bcond_with to disable brainpool curves
+
+* Fri Apr 08 2022 Jakub Jelen <jjelen@redhat.com> - 1.10.1-2
+- Adjust integrity check creation to match upstream (#2073018)
+
+* Tue Mar 29 2022 Jakub Jelen <jjelen@redhat.com> - 1.10.1-1
+- Final release (#2069263)
+
+* Wed Feb 02 2022 Jakub Jelen <jjelen@redhat.com> - 1.10.0-1
+- New upstream release (#2049322)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Aug 23 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.4-1
+- New upstream release (#1996467)
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 15 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.3-3
+- Fix for CVE-2021-33560 (#1970098)
+
+* Wed Apr 28 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.3-2
+- Restore the CET protection (#1954049)
+
+* Tue Apr 20 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.3-1
+- New upstream release (#1951325)
+
+* Thu Apr 15 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.2-3
+- Fix issues reported by coverity
+
+* Mon Mar 29 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.2-2
+- Fix OCB tag creation on s390x (failing gnupg2 tests)
+
+* Wed Feb 17 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.2-1
+- New upstream release (#1929630)
+
+* Fri Jan 29 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-1
+- New upstream release (#1922156, #1922097)
+
+* Wed Jan 20 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.0-1
+- New upstream release (#1917878)
+
+* Tue Nov 24 2020 Jakub Jelen <jjelen@redhat.com> - 1.8.7-1
+- new upstream release (#1891123)
+
+* Fri Aug 21 2020 Jeff Law <law@redhat.com> - 1.8.6-4
+- Re-enable LTO
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Tom Stellard <tstellar@redhat.com> - 1.8.6-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Mon Jul 20 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.6-1
+- new upstream version 1.8.6
+
+* Wed Jul  1 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.5-7
+- use the hmac256 tool to calculate the library hmac
+
+* Tue Jun 30 2020 Jeff Law <law@redhat.com>
+- Disable LTO
+
+* Thu Apr 23 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.5-6
+- Fix regression - missing -ldl linkage
+
+* Wed Apr 22 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.5-5
+- AES performance improvements backported from master branch
+
+* Mon Apr 20 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.5-4
+- FIPS selftest is run directly from the constructor
+- FIPS module is implicit with kernel FIPS flag
+
+* Thu Jan 30 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.5-3
+- fix the build on ARMv7
+
+* Thu Jan 23 2020 Tomáš Mráz <tmraz@redhat.com> 1.8.5-2
+- Intel CET support by H. J. Lu
+
+* Tue Sep  3 2019 Tomáš Mráz <tmraz@redhat.com> 1.8.5-1
+- new upstream version 1.8.5
+- add CMAC selftest for FIPS POST
+- add continuous FIPS entropy test
+- disable non-approved FIPS hashes in the enforced FIPS mode
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Feb 12 2019 Tomáš Mráz <tmraz@redhat.com> 1.8.4-3
+- fix the build tests to pass in the FIPS mode
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Nov 20 2018 Tomáš Mráz <tmraz@redhat.com> 1.8.4-1
+- new upstream version 1.8.4
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 12 2018 Tomáš Mráz <tmraz@redhat.com> 1.8.3-2
+- make only_urandom a default in non-presence of configuration file
+- run the full FIPS selftests only when the library is called from
+  application
+
+* Thu Jun 14 2018 Tomáš Mráz <tmraz@redhat.com> 1.8.3-1
+- new upstream version 1.8.3
+
+* Tue Feb  6 2018 Tomáš Mráz <tmraz@redhat.com> 1.8.2-2
+- fix behavior when getrandom syscall is not present (#1542453)
+
+* Thu Dec 21 2017 Tomáš Mráz <tmraz@redhat.com> 1.8.2-1
+- new upstream version 1.8.2
+
+* Tue Dec  5 2017 Tomáš Mráz <tmraz@redhat.com> 1.8.1-3
+- do not try to access() /dev/urandom either if getrandom() works
+
+* Mon Dec  4 2017 Tomáš Mráz <tmraz@redhat.com> 1.8.1-2
+- do not try to open /dev/urandom if getrandom() works (#1380866)
+
+* Tue Sep  5 2017 Tomáš Mráz <tmraz@redhat.com> 1.8.1-1
+- new upstream version 1.8.1
+
+* Wed Aug 16 2017 Tomáš Mráz <tmraz@redhat.com> 1.8.0-1
+- new upstream version 1.8.0
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun 29 2017 Tomáš Mráz <tmraz@redhat.com> 1.7.8-1
+- new upstream version 1.7.8
+
+* Fri Jun  2 2017 Tomáš Mráz <tmraz@redhat.com> 1.7.7-1
+- new upstream version 1.7.7
+- GOST is now enabled
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan 30 2017 Tomáš Mráz <tmraz@redhat.com> 1.7.6-1
+- new upstream version 1.7.6
+
+* Fri Dec 16 2016 Tomáš Mráz <tmraz@redhat.com> 1.7.5-1
+- new upstream version 1.7.5
+
+* Wed Nov 23 2016 Tomáš Mráz <tmraz@redhat.com> 1.7.3-1
+- new upstream version 1.7.3
+
+* Wed Aug 17 2016 Tomáš Mráz <tmraz@redhat.com> 1.6.6-1
+- new upstream version with important security fix (CVE-2016-6316)
+
+* Thu Jul 21 2016 Tomáš Mráz <tmraz@redhat.com> 1.6.5-1
+- new upstream version fixing low impact issue CVE-2015-7511
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Sep  9 2015 Tomáš Mráz <tmraz@redhat.com> 1.6.4-1
+- new upstream version
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Fri Apr  3 2015 Tomáš Mráz <tmraz@redhat.com> 1.6.3-4
 - deinitialize the RNG after the selftest is run
 

signature_key.asc

@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBFjLuq4BDACnM7zNSIaVMAacTwjXa5TGYe13i6ilHe4VL0NShzrgzjcQg531
+3cRgiiiNA7OSOypMqVs73Jez6ZUctn2GVsHBrS/io9NcuC9pVwf8a61WlcEa+EtB
+a3G7HlBmEWnwaUdAtWKNuAi9Xn+Ir7H2xEdksmmd5a0/QnL+sX705boVPF/tpYtb
+LGpPxa78tNrtxDkSwy8Wmi0IADYLI5yI7/yUGeJd8RSCU/fLRKC9fG7YOZRq0tsO
+MhVNWmtUjbG6e73Lu8LKnCZgs1/fC8hvPyARieSV5mdN8s1oWd7oYctfgL4uBleD
+ItAA8GhjKejutzHN8Ei/APw6AiiSyEjnPg+cTX8OgvLGJWjks0H6mPZeB1v/kGyZ
+hBS9vm540h2/MmlVN2ntiCK5TZGeSWpqddiqusfVXotMRpN4HeLKoZh4RAncaCbZ
+F/S+YLeN+kMXY4k3Fqt1fjTX6veFCbthI9pDdHzU9LfUVNp9D/5ktC/tYMORMegV
++wSMxi9G2YWKJkMAEQEAAYkBzgQfAQgAOBYhBFuAxXVCmPDLVdjtarzvfilLCS4o
+BQJYy8DdFwyAAZSlyaA8L+XKOwldjh/fcjz0YraxAgcAAAoJELzvfilLCS4oNgoL
+/0+K1xIx8JW7Lk5M6bYCvNA4fdlEcwQIT4UidJFM9m+suxYFWIGfebvHpRlEuJTg
+dBjkEit8uLAoJXU0BRkKTLrzTF+qDUE79Wfx/R+0nOgJ7aMykQOi0AvuwzMYz4dg
+xIVS2Daou4DF7bh/KF8+fqrmq8P8W1ZrkuFDanMWpHeAPx1uj2skYbo7uPqFdvlJ
+hlNHrcxlcCkjf1InAt0Xt5lMvEsCRUPf9xAH4mNEhs0lh9c+200YPRmtnLWAzc1K
+ckLIC8Q+mUR3DjZDqBlDBEPegXkrI0+MlvRA+9AnAm4YPqTMUfpZ6ZOAWeFjC/6Z
+QYxG/AdWGkb4WFindzklQfybEuiekP8vU07ACQwSwH8PYe0UCom1YrlRUjX7QLkn
+ZLWoeZg8BZy9GTM1Ut7Q1Q2uTw6mxxISuef+RFgYOHjWwLpFWZpqC88xERl7o/iz
+iERJRt/593IctbjO9wenWt2peIAwzR4nz7LqM6ZFTdRAETmcdSvYRhg2Qt8hUE47
+CbQkQW5kcmUgSGVpbmVja2UgKFJlbGVhc2UgU2lnbmluZyBLZXkpiQHUBBMBCAA+
+FiEEW4DFdUKY8MtV2O1qvO9+KUsJLigFAljLuq4CGwMFCRLMAwAFCwkIBwIGFQgJ
+CgsCBBYCAwECHgECF4AACgkQvO9+KUsJLihC/QwAhCC+SEvcFLcutgZ8HfcCtoZs
+IoVzZEy7DjqIvGgnTssD8HCLnIAHCDvnP7dJW3uMuLCdSqym3cjlEIiQMsaGywkl
+fzJISAwJrGQdWSKRd535jXpEXQlXDKal/IwMKAUt0PZtlCc9S3gwixQryxdJ28lJ
+6h2T9fVDr8ZswMmTAFG91uctfhjKOMgPt8UhSPGW484WsIsQgkbOvf+Kfswl0eHu
+ywX+pKAB5ZQ/9GVC6Ug4xfrdiJL0azJTPnvjMY5JYp6/L9RURs5hP5AnHR2j/PPo
+sAtsFCjmbRbOMiASzklnUJPbSz5kfLloDWZmrUScjbzmsXehGyt433JGyRhZJl4x
+/jPbzKhaaAHsGd+fRao6vlLOwFywDDVMp6JuyK7UeUb7I8ekTbSkGFA+l2Oa3O6/
+Y7PYhq7hwwAFuZckYI98IpHNCG1fS9W07FyKdvQbK1PbF1JFRKfsUCWYMKqDnbqE
+o5jivPEHZImw6iYhhXcyEYl8fjcb9T6/S+wOP7aviQGzBBABCAAdFiEElKXJoDwv
+5co7CV2OH99yPPRitrEFAljLv5sACgkQH99yPPRitrFw4gv/XFMFN+/LHsn9hJOP
+4rCwl1yUuxXuYmZgc0sRoY3EpeQkJVyKurQuqqKoy2VuoMiF0O1kAQmGoFtVPUk7
+b8hCoutqB5GyeyKcoLP+WINgVhB2gXg7TSp3MPLBKkgqvSDvPitgRxBqFb4LW8LJ
+bDbfwGrzIvXfDV3WvsrHVPbc2fhlWdL8d+3AE6mFiXF3eTpgmV3ApSBQV12MkkCk
+icLIPmp+ZxZON+OP52ZXkRtfMgOy4Oa/41agrViDAZdMOGeGkhPertQheQZgXzmo
+GF5Wz498HPM80Kv35X91l3iGzL+icEtO+tWea2YscsZ6qpRe2lfVPHk3B+anlmCj
+m4kM4cBd39xa4HHSVh/bRHbZNtgVr7slQCKxlHgQOGVI5vCxPCwEsgJ2KBk03Nk/
+IA9EKO+czfh3/bHW6uMbEqrYDCnt+hmzZrpKDSGcwS/KOhvMUIMlb7/8vDKum6mp
+/8xAtVZ6IAxYZNt3qg7Y7aLRtzCTyqm8rJQrZPtRaQcgLoEimDMEX0PliRYJKwYB
+BAHaRw8BAQdAz75Hlekc16JhhfI0MKdEVxLdkxhcMCO0ZG6WMBAmNpe0H1dlcm5l
+ciBLb2NoIChkaXN0IHNpZ25pbmcgMjAyMCmImgQTFgoAQhYhBG2qbmSnbShAVxtJ
+AlKIl7gmQDraBQJfQ+w1AhsDBQkShccRBQsJCAcCAyICAQYVCgkICwIEFgIDAQIe
+BwIXgAAKCRBSiJe4JkA62nmuAP9uL/HOdB0gvwWrH+FpURJLs4bnaZaPIk9ARrU0
+EXRgJgD/YCGfHQXpIPT0ZaXuwJexK04Z+qMFR/bM1q1Leo5CjgaIbQQQEQsAHRYh
+BIBhWHD1utaQMzaG0PKthaweQrNnBQJfQ/HmAAoJEPKthaweQrNnIZkA3jG6LcZv
+V/URn8Y8OJqsyYa4C3NI4nN+OhEvYhgA4PHzMnALeXIpA2gblvjFIPJPAhDBAU37
+c5PA6+6IdQQQFggAHRYhBK6oTtzwGthsRwHIXGMROuhmWH0KBQJfQ/IlAAoJEGMR
+OuhmWH0K1+MA/0uJ5AHcnSfIBEWHNJwwVVLGyrxAWtS2U+zeymp/UvlPAQDErCLZ
+l0dBiPG3vlowFx5TNep7tanBs6ZJn8F1ao1tAIkBMwQQAQgAHRYhBNhpISPEBl3q
+Xg86tSSbOdJPJeO2BQJfQ/OuAAoJECSbOdJPJeO2DVoH/0o9if66ph6FJrgr+A/W
+HNVeHxmM5tUQhpL1wpRS70SKcsJgolf5CxO5iTQf3HlZe544xGbIU/aCTJsWw9zi
+UE8KmhAtKV4eL/7oQ7xx4nxPnABLpudtM8A44nsM1x/XiYrJnnDm29QjYEGd2Hi8
+7npc7VWKzLoj+I/WcXquynJi5O9TUxW9Bknd1pjpxFkf8v+msjBzCD5VKJgr0CR8
+wA6peQBWeGZX2HacosMIZH4TfL0r0TFla6LJIkNBz9DyIm1yL4L8oRH0950hQljP
+C7TM3L7aRpX+4Kph6llFz6g7MALGFP95kyJ6o+XED9ORuuQVZMBMIkNC0tXOu10V
+bdqIdQQQFgoAHRYhBMHTS2khnkruwLocIeP9/yGORbcrBQJfQ/P8AAoJEOP9/yGO
+Rbcr3lQBAMas8Vl3Hdl3g2I283lz1uHiGvlwcnk2TLeB+U4zIwC9AQCy0nnazVNt
+VQPID1ZCMoaOX7AzOjaqQDLf4j+dVTxgBJgzBGCkgocWCSsGAQQB2kcPAQEHQJmd
+fwp8jEN5P3eEjhQiWk6zQi8utvgOvYD57XmE+H8+tCBOaWliZSBZdXRha2EgKEdu
+dVBHIFJlbGVhc2UgS2V5KYiaBBMWCgBCFiEErI4RW/c+LY1H+pkI6Y6bLRnGyL0F
+AmCkgocCGwMFCQsNBpkFCwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEOmO
+my0Zxsi9/4IA/1rvSr3MU+Sv4jhNDzD+CeC3gmHkPew6pi9VHEsEwdgmAQD2BtiX
+7w1sJL/CBylGWv5jxj4345mP9YfZm0RsgzPjDIh1BBAWCAAdFiEEJJyzdxdQdF1c
+3TI84mewUjZPAo0FAmFAQ54ACgkQ4mewUjZPAo1CiAD+KTT1UVdQTGHMyvHwZocS
+QjU8xhcZrTet+dvvjrE5+4MA/RBdJPZgFevUKu68NEy0Lo+RbkeCtmQJ/c8v5ieF
+vW0AiQEzBBABCAAdFiEEEkEkvTtIYq96CkLxALRevUynur4FAmFAQ7cACgkQALRe
+vUynur4kaAgAolPR8TNWVS0vXMKrr0k0l2M/8QkZTaLZx1GT9Nx1yb4WJKY7ElPM
+YkhGDxetvFBETx0pH/6R3jtj6Crmur+NKHVSRY+rCYpFPDn6ciIOryssRx2G4kCZ
+t+nFB9JyDbBOZAR8DK4pN1mAxG/yLDt4oKcUQsP2xlEFum+phxyR8KyYCpkwKRxY
+eK+6lfilQuveoUwp/Xx5wXPNUy6q4eOOovCW7gS7I7288NGHCa2ul8sD6vA9C4mM
+4Zxaole9P9wwJe1zZFtCIy88zHM9vqv+YM9DxMCaW24+rUztr7eD4bCRdG+QlSh+
+7R/TaqSxY1eAAd1J5tma9CNJO73pTKU+/JhTBGFpSqMTCSskAwMCCAEBBwIDBF6X
+D9NmUQDgiyYNbhs1DMJ14mIw812wY1HVx/4QWYWiBunhrvSFxVbzsjD7/Wv+v3bm
+MPrL+M2DLyFiSewNmcS0JEdudVBHLmNvbSAoUmVsZWFzZSBTaWduaW5nIEtleSAy
+MDIxKYiaBBMTCABCFiEEAvON/3Mf+XywOaHaVJ5pXpBboggFAmFpSqMCGwMFCQ9x
+14oFCwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEFSeaV6QW6IITkoA/RYa
+jaTl1eEBU/Gdm12o3jrI55N5xZK2XTqSx25clVyjAP0XwMW/Og5+ND1ri3bAqADV
+WlBDUswz8wYxsb0C4kYBkoh1BBAWCgAdFiEEbapuZKdtKEBXG0kCUoiXuCZAOtoF
+AmFpTvEACgkQUoiXuCZAOtrJQAEAh7YyykjAy/Qs1yC3ji8iBfIVnPXvblrIx3SR
+RyDwRC8BAKtZbEuKTtPlgkLUgMleTcZJ/vEhJE+GvfQ9o5gWCqEFiHUEEBYKAB0W
+IQTB00tpIZ5K7sC6HCHj/f8hjkW3KwUCYWlPWgAKCRDj/f8hjkW3Kx4eAQDp6aGS
+N/fU4xLl8RSvQUVjVA+aCTrMQR3hRwqw8liF2wEA3O3ECxz6e1+DoItYoJBBLKLw
+eiInsGZ/+h5XYrpXTgA=
+=4+Sn
+-----END PGP PUBLIC KEY BLOCK-----

sources

@@ -1 +1,2 @@
-cbb7aa4b8c4c63f24e954fbf00e16335  libgcrypt-1.6.3-hobbled.tar.xz
+SHA512 (libgcrypt-1.11.2.tar.bz2) = b706cea602cc8f0896e57ce979643bf78974b05faec27c1b053b773c57d8b04250e30e95a4ef5899e1df981d01d8d08f0a36e10b5820a5ec4183e74c02e5f1f0
+SHA512 (libgcrypt-1.11.2.tar.bz2.sig) = e63d240a9b97aa218c98c5baa72a30321ae85412d4a8748e36578bd9498fe8c8ee2ba84835d1783cdfc1e5dfb66b0a89409d6263e9c06f4cd11e919d4bce0cd2

t-mpi-point.c

@@ -1,970 +0,0 @@
-/* t-mpi-point.c  - Tests for mpi point functions
- * Copyright (C) 2013 g10 Code GmbH
- *
- * This file is part of Libgcrypt.
- *
- * Libgcrypt is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * Libgcrypt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdarg.h>
-
-#include "../src/gcrypt-int.h"
-
-#define PGM "t-mpi-point"
-
-static const char *wherestr;
-static int verbose;
-static int debug;
-static int error_count;
-
-
-#define my_isascii(c) (!((c) & 0x80))
-#define digitp(p)   (*(p) >= '0' && *(p) <= '9')
-#define hexdigitp(a) (digitp (a)                     \
-                      || (*(a) >= 'A' && *(a) <= 'F')  \
-                      || (*(a) >= 'a' && *(a) <= 'f'))
-#define xtoi_1(p)   (*(p) <= '9'? (*(p)- '0'): \
-                     *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
-#define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
-#define xmalloc(a)    gcry_xmalloc ((a))
-#define xcalloc(a,b)  gcry_xcalloc ((a),(b))
-#define xfree(a)      gcry_free ((a))
-#define pass() do { ; } while (0)
-
-
-static struct
-{
-  const char *desc;           /* Description of the curve.  */
-  const char *p;              /* Order of the prime field.  */
-  const char *a, *b;          /* The coefficients. */
-  const char *n;              /* The order of the base point.  */
-  const char *g_x, *g_y;      /* Base point.  */
-} test_curve[] =
-  {
-    {
-      "NIST P-256",
-      "0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
-      "0xffffffff00000001000000000000000000000000fffffffffffffffffffffffc",
-      "0x5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b",
-      "0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551",
-
-      "0x6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296",
-      "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5"
-    },
-    {
-      "NIST P-384",
-      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
-      "ffffffff0000000000000000ffffffff",
-      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
-      "ffffffff0000000000000000fffffffc",
-      "0xb3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875a"
-      "c656398d8a2ed19d2a85c8edd3ec2aef",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffc7634d81f4372ddf"
-      "581a0db248b0a77aecec196accc52973",
-
-      "0xaa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a38"
-      "5502f25dbf55296c3a545e3872760ab7",
-      "0x3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c0"
-      "0a60b1ce1d7e819d7a431d7c90ea0e5f"
-    },
-    {
-      "NIST P-521",
-      "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-      "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-      "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc",
-      "0x051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef10"
-      "9e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00",
-      "0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-      "ffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409",
-
-      "0xc6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3d"
-      "baa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66",
-      "0x11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e6"
-      "62c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650"
-    },
-    {
-      "Ed25519",
-      "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED",
-      "-0x01",
-      "-0x2DFC9311D490018C7338BF8688861767FF8FF5B2BEBE27548A14B235ECA6874A",
-      "0x1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED",
-      "0x216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A",
-      "0x6666666666666666666666666666666666666666666666666666666666666658"
-    },
-    { NULL, NULL, NULL, NULL, NULL }
-  };
-
-/* A sample public key for NIST P-256.  */
-static const char sample_p256_q[] =
-  "04"
-  "42B927242237639A36CE9221B340DB1A9AB76DF2FE3E171277F6A4023DED146E"
-  "E86525E38CCECFF3FB8D152CC6334F70D23A525175C1BCBDDE6E023B2228770E";
-static const char sample_p256_q_x[] =
-  "42B927242237639A36CE9221B340DB1A9AB76DF2FE3E171277F6A4023DED146E";
-static const char sample_p256_q_y[] =
-  "00E86525E38CCECFF3FB8D152CC6334F70D23A525175C1BCBDDE6E023B2228770E";
-
-
-/* A sample public key for Ed25519.  */
-static const char sample_ed25519_q[] =
-  "04"
-  "55d0e09a2b9d34292297e08d60d0f620c513d47253187c24b12786bd777645ce"
-  "1a5107f7681a02af2523a6daf372e10e3a0764c9d3fe4bd5b70ab18201985ad7";
-static const char sample_ed25519_q_x[] =
-  "55d0e09a2b9d34292297e08d60d0f620c513d47253187c24b12786bd777645ce";
-static const char sample_ed25519_q_y[] =
-  "1a5107f7681a02af2523a6daf372e10e3a0764c9d3fe4bd5b70ab18201985ad7";
-static const char sample_ed25519_q_eddsa[] =
-  "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a";
-static const char sample_ed25519_d[] =
-  "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60";
-
-
-static void
-show (const char *format, ...)
-{
-  va_list arg_ptr;
-
-  if (!verbose)
-    return;
-  fprintf (stderr, "%s: ", PGM);
-  va_start (arg_ptr, format);
-  vfprintf (stderr, format, arg_ptr);
-  va_end (arg_ptr);
-}
-
-static void
-fail (const char *format, ...)
-{
-  va_list arg_ptr;
-
-  fflush (stdout);
-  fprintf (stderr, "%s: ", PGM);
-  if (wherestr)
-    fprintf (stderr, "%s: ", wherestr);
-  va_start (arg_ptr, format);
-  vfprintf (stderr, format, arg_ptr);
-  va_end (arg_ptr);
-  error_count++;
-}
-
-static void
-die (const char *format, ...)
-{
-  va_list arg_ptr;
-
-  fflush (stdout);
-  fprintf (stderr, "%s: ", PGM);
-  if (wherestr)
-    fprintf (stderr, "%s: ", wherestr);
-  va_start (arg_ptr, format);
-  vfprintf (stderr, format, arg_ptr);
-  va_end (arg_ptr);
-  exit (1);
-}
-
-
-static void
-print_mpi_2 (const char *text, const char *text2, gcry_mpi_t a)
-{
-  gcry_error_t err;
-  char *buf;
-  void *bufaddr = &buf;
-
-  err = gcry_mpi_aprint (GCRYMPI_FMT_HEX, bufaddr, NULL, a);
-  if (err)
-    fprintf (stderr, "%s%s: [error printing number: %s]\n",
-             text, text2? text2:"", gpg_strerror (err));
-  else
-    {
-      fprintf (stderr, "%s%s: %s\n", text, text2? text2:"", buf);
-      gcry_free (buf);
-    }
-}
-
-
-static void
-print_mpi (const char *text, gcry_mpi_t a)
-{
-  print_mpi_2 (text, NULL, a);
-}
-
-
-static void
-print_point (const char *text, gcry_mpi_point_t a)
-{
-  gcry_mpi_t x, y, z;
-
-  x = gcry_mpi_new (0);
-  y = gcry_mpi_new (0);
-  z = gcry_mpi_new (0);
-  gcry_mpi_point_get (x, y, z, a);
-  print_mpi_2 (text, ".x", x);
-  print_mpi_2 (text, ".y", y);
-  print_mpi_2 (text, ".z", z);
-  gcry_mpi_release (x);
-  gcry_mpi_release (y);
-  gcry_mpi_release (z);
-}
-
-
-static void
-print_sexp (const char *prefix, gcry_sexp_t a)
-{
-  char *buf;
-  size_t size;
-
-  if (prefix)
-    fputs (prefix, stderr);
-  size = gcry_sexp_sprint (a, GCRYSEXP_FMT_ADVANCED, NULL, 0);
-  buf = gcry_xmalloc (size);
-
-  gcry_sexp_sprint (a, GCRYSEXP_FMT_ADVANCED, buf, size);
-  fprintf (stderr, "%.*s", (int)size, buf);
-  gcry_free (buf);
-}
-
-
-static gcry_mpi_t
-hex2mpi (const char *string)
-{
-  gpg_error_t err;
-  gcry_mpi_t val;
-
-  err = gcry_mpi_scan (&val, GCRYMPI_FMT_HEX, string, 0, NULL);
-  if (err)
-    die ("hex2mpi '%s' failed: %s\n", string, gpg_strerror (err));
-  return val;
-}
-
-
-/* Convert STRING consisting of hex characters into its binary
-   representation and return it as an allocated buffer. The valid
-   length of the buffer is returned at R_LENGTH.  The string is
-   delimited by end of string.  The function returns NULL on
-   error.  */
-static void *
-hex2buffer (const char *string, size_t *r_length)
-{
-  const char *s;
-  unsigned char *buffer;
-  size_t length;
-
-  buffer = xmalloc (strlen(string)/2+1);
-  length = 0;
-  for (s=string; *s; s +=2 )
-    {
-      if (!hexdigitp (s) || !hexdigitp (s+1))
-        return NULL;           /* Invalid hex digits. */
-      ((unsigned char*)buffer)[length++] = xtoi_2 (s);
-    }
-  *r_length = length;
-  return buffer;
-}
-
-
-static gcry_mpi_t
-hex2mpiopa (const char *string)
-{
-  char *buffer;
-  size_t buflen;
-  gcry_mpi_t val;
-
-  buffer = hex2buffer (string, &buflen);
-  if (!buffer)
-    die ("hex2mpiopa '%s' failed: parser error\n", string);
-  val = gcry_mpi_set_opaque (NULL, buffer, buflen*8);
-  if (!buffer)
-    die ("hex2mpiopa '%s' failed: set_opaque error%s\n", string);
-  return val;
-}
-
-
-/* Compare A to B, where B is given as a hex string.  */
-static int
-cmp_mpihex (gcry_mpi_t a, const char *b)
-{
-  gcry_mpi_t bval;
-  int res;
-
-  if (gcry_mpi_get_flag (a, GCRYMPI_FLAG_OPAQUE))
-    bval = hex2mpiopa (b);
-  else
-    bval = hex2mpi (b);
-  res = gcry_mpi_cmp (a, bval);
-  gcry_mpi_release (bval);
-  return res;
-}
-
-
-/* Wrapper to emulate the libgcrypt internal EC context allocation
-   function.  */
-static gpg_error_t
-ec_p_new (gcry_ctx_t *r_ctx, gcry_mpi_t p, gcry_mpi_t a)
-{
-  gpg_error_t err;
-  gcry_sexp_t sexp;
-
-  if (p && a)
-    err = gcry_sexp_build (&sexp, NULL, "(ecdsa (p %m)(a %m))", p, a);
-  else if (p)
-    err = gcry_sexp_build (&sexp, NULL, "(ecdsa (p %m))", p);
-  else if (a)
-    err = gcry_sexp_build (&sexp, NULL, "(ecdsa (a %m))", a);
-  else
-    err = gcry_sexp_build (&sexp, NULL, "(ecdsa)");
-  if (err)
-    return err;
-  err = gcry_mpi_ec_new (r_ctx, sexp, NULL);
-  gcry_sexp_release (sexp);
-  return err;
-}
-
-
-
-static void
-set_get_point (void)
-{
-  gcry_mpi_point_t point;
-  gcry_mpi_t x, y, z;
-
-  wherestr = "set_get_point";
-  show ("checking point setting functions\n");
-
-  point = gcry_mpi_point_new (0);
-  x = gcry_mpi_set_ui (NULL, 17);
-  y = gcry_mpi_set_ui (NULL, 42);
-  z = gcry_mpi_set_ui (NULL, 11371);
-  gcry_mpi_point_get (x, y, z, point);
-  if (gcry_mpi_cmp_ui (x, 0)
-      || gcry_mpi_cmp_ui (y, 0) || gcry_mpi_cmp_ui (z, 0))
-    fail ("new point not initialized to (0,0,0)\n");
-  gcry_mpi_point_snatch_get (x, y, z, point);
-  point = NULL;
-  if (gcry_mpi_cmp_ui (x, 0)
-      || gcry_mpi_cmp_ui (y, 0) || gcry_mpi_cmp_ui (z, 0))
-    fail ("snatch_get failed\n");
-  gcry_mpi_release (x);
-  gcry_mpi_release (y);
-  gcry_mpi_release (z);
-
-  point = gcry_mpi_point_new (0);
-  x = gcry_mpi_set_ui (NULL, 17);
-  y = gcry_mpi_set_ui (NULL, 42);
-  z = gcry_mpi_set_ui (NULL, 11371);
-  gcry_mpi_point_set (point, x, y, z);
-  gcry_mpi_set_ui (x, 23);
-  gcry_mpi_set_ui (y, 24);
-  gcry_mpi_set_ui (z, 25);
-  gcry_mpi_point_get (x, y, z, point);
-  if (gcry_mpi_cmp_ui (x, 17)
-      || gcry_mpi_cmp_ui (y, 42) || gcry_mpi_cmp_ui (z, 11371))
-    fail ("point_set/point_get failed\n");
-  gcry_mpi_point_snatch_set (point, x, y, z);
-  x = gcry_mpi_new (0);
-  y = gcry_mpi_new (0);
-  z = gcry_mpi_new (0);
-  gcry_mpi_point_get (x, y, z, point);
-  if (gcry_mpi_cmp_ui (x, 17)
-      || gcry_mpi_cmp_ui (y, 42) || gcry_mpi_cmp_ui (z, 11371))
-    fail ("point_snatch_set/point_get failed\n");
-
-  gcry_mpi_point_release (point);
-  gcry_mpi_release (x);
-  gcry_mpi_release (y);
-  gcry_mpi_release (z);
-}
-
-
-static void
-context_alloc (void)
-{
-  gpg_error_t err;
-  gcry_ctx_t ctx;
-  gcry_mpi_t p, a;
-
-  wherestr = "context_alloc";
-  show ("checking context functions\n");
-
-  p = gcry_mpi_set_ui (NULL, 1);
-  a = gcry_mpi_set_ui (NULL, 1);
-  err = ec_p_new (&ctx, p, a);
-  if (err)
-    die ("ec_p_new returned an error: %s\n", gpg_strerror (err));
-  gcry_mpi_release (p);
-  gcry_mpi_release (a);
-  gcry_ctx_release (ctx);
-
-  p = gcry_mpi_set_ui (NULL, 0);
-  a = gcry_mpi_set_ui (NULL, 0);
-  err = ec_p_new (&ctx, p, a);
-  if (!err || gpg_err_code (err) != GPG_ERR_EINVAL)
-    fail ("ec_p_new: bad parameter detection failed (1)\n");
-
-  gcry_mpi_set_ui (p, 1);
-  err = ec_p_new (&ctx, p, a);
-  if (!err || gpg_err_code (err) != GPG_ERR_EINVAL)
-    fail ("ec_p_new: bad parameter detection failed (2)\n");
-
-  gcry_mpi_release (p);
-  p = NULL;
-  err = ec_p_new (&ctx, p, a);
-  if (!err || gpg_err_code (err) != GPG_ERR_EINVAL)
-    fail ("ec_p_new: bad parameter detection failed (3)\n");
-
-  gcry_mpi_release (a);
-  a = NULL;
-  err = ec_p_new (&ctx, p, a);
-  if (!err || gpg_err_code (err) != GPG_ERR_EINVAL)
-    fail ("ec_p_new: bad parameter detection failed (4)\n");
-
-}
-
-
-static int
-get_and_cmp_mpi (const char *name, const char *mpistring, const char *desc,
-                 gcry_ctx_t ctx)
-{
-  gcry_mpi_t mpi;
-
-  mpi = gcry_mpi_ec_get_mpi (name, ctx, 1);
-  if (!mpi)
-    {
-      fail ("error getting parameter '%s' of curve '%s'\n", name, desc);
-      return 1;
-    }
-  if (debug)
-    print_mpi (name, mpi);
-  if (cmp_mpihex (mpi, mpistring))
-    {
-      fail ("parameter '%s' of curve '%s' does not match\n", name, desc);
-      gcry_mpi_release (mpi);
-      return 1;
-    }
-  gcry_mpi_release (mpi);
-  return 0;
-}
-
-
-static int
-get_and_cmp_point (const char *name,
-                   const char *mpi_x_string, const char *mpi_y_string,
-                   const char *desc, gcry_ctx_t ctx)
-{
-  gcry_mpi_point_t point;
-  gcry_mpi_t x, y, z;
-  int result = 0;
-
-  point = gcry_mpi_ec_get_point (name, ctx, 1);
-  if (!point)
-    {
-      fail ("error getting point parameter '%s' of curve '%s'\n", name, desc);
-      return 1;
-    }
-  if (debug)
-    print_point (name, point);
-
-  x = gcry_mpi_new (0);
-  y = gcry_mpi_new (0);
-  z = gcry_mpi_new (0);
-  gcry_mpi_point_snatch_get (x, y, z, point);
-  if (cmp_mpihex (x, mpi_x_string))
-    {
-      fail ("x coordinate of '%s' of curve '%s' does not match\n", name, desc);
-      result = 1;
-    }
-  if (cmp_mpihex (y, mpi_y_string))
-    {
-      fail ("y coordinate of '%s' of curve '%s' does not match\n", name, desc);
-      result = 1;
-    }
-  if (cmp_mpihex (z, "01"))
-    {
-      fail ("z coordinate of '%s' of curve '%s' is not 1\n", name, desc);
-      result = 1;
-    }
-  gcry_mpi_release (x);
-  gcry_mpi_release (y);
-  gcry_mpi_release (z);
-  return result;
-}
-
-
-static void
-context_param (void)
-{
-  gpg_error_t err;
-  int idx;
-  gcry_ctx_t ctx = NULL;
-  gcry_mpi_t q, d;
-  gcry_sexp_t keyparam;
-
-  wherestr = "context_param";
-
-  show ("checking standard curves\n");
-  for (idx=0; test_curve[idx].desc; idx++)
-    {
-      gcry_ctx_release (ctx);
-      err = gcry_mpi_ec_new (&ctx, NULL, test_curve[idx].desc);
-      if (err)
-        {
-          fail ("can't create context for curve '%s': %s\n",
-                test_curve[idx].desc, gpg_strerror (err));
-          continue;
-        }
-      if (get_and_cmp_mpi ("p", test_curve[idx].p, test_curve[idx].desc, ctx))
-        continue;
-      if (get_and_cmp_mpi ("a", test_curve[idx].a, test_curve[idx].desc, ctx))
-        continue;
-      if (get_and_cmp_mpi ("b", test_curve[idx].b, test_curve[idx].desc, ctx))
-        continue;
-      if (get_and_cmp_mpi ("g.x",test_curve[idx].g_x, test_curve[idx].desc,ctx))
-        continue;
-      if (get_and_cmp_mpi ("g.y",test_curve[idx].g_y, test_curve[idx].desc,ctx))
-        continue;
-      if (get_and_cmp_mpi ("n", test_curve[idx].n, test_curve[idx].desc, ctx))
-        continue;
-      if (get_and_cmp_point ("g", test_curve[idx].g_x, test_curve[idx].g_y,
-                             test_curve[idx].desc, ctx))
-        continue;
-
-    }
-
-  show ("checking sample public key (nistp256)\n");
-  q = hex2mpi (sample_p256_q);
-  err = gcry_sexp_build (&keyparam, NULL,
-                        "(public-key(ecc(curve %s)(q %m)))",
-                        "NIST P-256", q);
-  if (err)
-    die ("gcry_sexp_build failed: %s\n", gpg_strerror (err));
-  gcry_mpi_release (q);
-
-  /* We can't call gcry_pk_testkey because it is only implemented for
-     private keys.  */
-  /* err = gcry_pk_testkey (keyparam); */
-  /* if (err) */
-  /*   fail ("gcry_pk_testkey failed for sample public key: %s\n", */
-  /*         gpg_strerror (err)); */
-
-  gcry_ctx_release (ctx);
-  err = gcry_mpi_ec_new (&ctx, keyparam, NULL);
-  if (err)
-    fail ("gcry_mpi_ec_new failed for sample public key (nistp256): %s\n",
-          gpg_strerror (err));
-  else
-    {
-      gcry_sexp_t sexp;
-
-      get_and_cmp_mpi ("q", sample_p256_q, "nistp256", ctx);
-      get_and_cmp_point ("q", sample_p256_q_x, sample_p256_q_y, "nistp256",
-                         ctx);
-
-      /* Delete Q.  */
-      err = gcry_mpi_ec_set_mpi ("q", NULL, ctx);
-      if (err)
-        fail ("clearing Q for nistp256 failed: %s\n", gpg_strerror (err));
-      if (gcry_mpi_ec_get_mpi ("q", ctx, 0))
-        fail ("clearing Q for nistp256 did not work\n");
-
-      /* Set Q again.  */
-      q = hex2mpi (sample_p256_q);
-      err = gcry_mpi_ec_set_mpi ("q", q, ctx);
-      if (err)
-        fail ("setting Q for nistp256 failed: %s\n", gpg_strerror (err));
-      get_and_cmp_mpi ("q", sample_p256_q, "nistp256(2)", ctx);
-      gcry_mpi_release (q);
-
-      /* Get as s-expression.  */
-      err = gcry_pubkey_get_sexp (&sexp, 0, ctx);
-      if (err)
-        fail ("gcry_pubkey_get_sexp(0) failed: %s\n", gpg_strerror (err));
-      else if (debug)
-        print_sexp ("Result of gcry_pubkey_get_sexp (0):\n", sexp);
-      gcry_sexp_release (sexp);
-
-      err = gcry_pubkey_get_sexp (&sexp, GCRY_PK_GET_PUBKEY, ctx);
-      if (err)
-        fail ("gcry_pubkey_get_sexp(GET_PUBKEY) failed: %s\n",
-              gpg_strerror (err));
-      else if (debug)
-        print_sexp ("Result of gcry_pubkey_get_sexp (GET_PUBKEY):\n", sexp);
-      gcry_sexp_release (sexp);
-
-      err = gcry_pubkey_get_sexp (&sexp, GCRY_PK_GET_SECKEY, ctx);
-      if (gpg_err_code (err) != GPG_ERR_NO_SECKEY)
-        fail ("gcry_pubkey_get_sexp(GET_SECKEY) returned wrong error: %s\n",
-              gpg_strerror (err));
-      gcry_sexp_release (sexp);
-    }
-
-  show ("checking sample public key (Ed25519)\n");
-  q = hex2mpi (sample_ed25519_q);
-  gcry_sexp_release (keyparam);
-  err = gcry_sexp_build (&keyparam, NULL,
-                        "(public-key(ecc(curve %s)(flags eddsa)(q %m)))",
-                        "Ed25519", q);
-  if (err)
-    die ("gcry_sexp_build failed: %s\n", gpg_strerror (err));
-  gcry_mpi_release (q);
-
-  /* We can't call gcry_pk_testkey because it is only implemented for
-     private keys.  */
-  /* err = gcry_pk_testkey (keyparam); */
-  /* if (err) */
-  /*   fail ("gcry_pk_testkey failed for sample public key: %s\n", */
-  /*         gpg_strerror (err)); */
-
-  gcry_ctx_release (ctx);
-  err = gcry_mpi_ec_new (&ctx, keyparam, NULL);
-  if (err)
-    fail ("gcry_mpi_ec_new failed for sample public key: %s\n",
-          gpg_strerror (err));
-  else
-    {
-      gcry_sexp_t sexp;
-
-      get_and_cmp_mpi ("q", sample_ed25519_q, "Ed25519", ctx);
-      get_and_cmp_point ("q", sample_ed25519_q_x, sample_ed25519_q_y,
-                         "Ed25519", ctx);
-      get_and_cmp_mpi ("q@eddsa", sample_ed25519_q_eddsa, "Ed25519", ctx);
-
-      /* Set d to see whether Q is correctly re-computed.  */
-      d = hex2mpi (sample_ed25519_d);
-      err = gcry_mpi_ec_set_mpi ("d", d, ctx);
-      if (err)
-        fail ("setting d for Ed25519 failed: %s\n", gpg_strerror (err));
-      gcry_mpi_release (d);
-      get_and_cmp_mpi ("q", sample_ed25519_q, "Ed25519(recompute Q)", ctx);
-
-      /* Delete Q by setting d and then clearing d.  The clearing is
-         required so that we can check whether Q has been cleared and
-         because further tests only expect a public key.  */
-      d = hex2mpi (sample_ed25519_d);
-      err = gcry_mpi_ec_set_mpi ("d", d, ctx);
-      if (err)
-        fail ("setting d for Ed25519 failed: %s\n", gpg_strerror (err));
-      gcry_mpi_release (d);
-      err = gcry_mpi_ec_set_mpi ("d", NULL, ctx);
-      if (err)
-        fail ("setting d for Ed25519 failed(2): %s\n", gpg_strerror (err));
-      if (gcry_mpi_ec_get_mpi ("q", ctx, 0))
-        fail ("setting d for Ed25519 did not reset Q\n");
-
-      /* Set Q again.  We need to use an opaque MPI here because
-         sample_ed25519_q is in uncompressed format which can only be
-         auto-detected if passed opaque.  */
-      q = hex2mpiopa (sample_ed25519_q);
-      err = gcry_mpi_ec_set_mpi ("q", q, ctx);
-      if (err)
-        fail ("setting Q for Ed25519 failed: %s\n", gpg_strerror (err));
-      gcry_mpi_release (q);
-      get_and_cmp_mpi ("q", sample_ed25519_q, "Ed25519(2)", ctx);
-
-      /* Get as s-expression.  */
-      err = gcry_pubkey_get_sexp (&sexp, 0, ctx);
-      if (err)
-        fail ("gcry_pubkey_get_sexp(0) failed: %s\n", gpg_strerror (err));
-      else if (debug)
-        print_sexp ("Result of gcry_pubkey_get_sexp (0):\n", sexp);
-      gcry_sexp_release (sexp);
-
-      err = gcry_pubkey_get_sexp (&sexp, GCRY_PK_GET_PUBKEY, ctx);
-      if (err)
-        fail ("gcry_pubkey_get_sexp(GET_PUBKEY) failed: %s\n",
-              gpg_strerror (err));
-      else if (debug)
-        print_sexp ("Result of gcry_pubkey_get_sexp (GET_PUBKEY):\n", sexp);
-      gcry_sexp_release (sexp);
-
-      err = gcry_pubkey_get_sexp (&sexp, GCRY_PK_GET_SECKEY, ctx);
-      if (gpg_err_code (err) != GPG_ERR_NO_SECKEY)
-        fail ("gcry_pubkey_get_sexp(GET_SECKEY) returned wrong error: %s\n",
-              gpg_strerror (err));
-      gcry_sexp_release (sexp);
-
-    }
-
-  gcry_ctx_release (ctx);
-  gcry_sexp_release (keyparam);
-}
-
-
-
-
-/* Create a new point from (X,Y,Z) given as hex strings.  */
-gcry_mpi_point_t
-make_point (const char *x, const char *y, const char *z)
-{
-  gcry_mpi_point_t point;
-
-  point = gcry_mpi_point_new (0);
-  gcry_mpi_point_snatch_set (point, hex2mpi (x), hex2mpi (y), hex2mpi (z));
-
-  return point;
-}
-
-
-/* This tests checks that the low-level EC API yields the same result
-   as using the high level API.  The values have been taken from a
-   test run using the high level API.  */
-static void
-basic_ec_math (void)
-{
-  gpg_error_t err;
-  gcry_ctx_t ctx;
-  gcry_mpi_t P, A;
-  gcry_mpi_point_t G, Q;
-  gcry_mpi_t d;
-  gcry_mpi_t x, y, z;
-
-  wherestr = "basic_ec_math";
-  show ("checking basic math functions for EC\n");
-
-  P = hex2mpi ("0xfffffffffffffffffffffffffffffffeffffffffffffffff");
-  A = hex2mpi ("0xfffffffffffffffffffffffffffffffefffffffffffffffc");
-  G = make_point ("188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-                  "7192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
-                  "1");
-  d = hex2mpi ("D4EF27E32F8AD8E2A1C6DDEBB1D235A69E3CEF9BCE90273D");
-  Q = gcry_mpi_point_new (0);
-
-  err = ec_p_new (&ctx, P, A);
-  if (err)
-    die ("ec_p_new failed: %s\n", gpg_strerror (err));
-
-  x = gcry_mpi_new (0);
-  y = gcry_mpi_new (0);
-  z = gcry_mpi_new (0);
-
-  {
-    /* A quick check that multiply by zero works.  */
-    gcry_mpi_t tmp;
-
-    tmp = gcry_mpi_new (0);
-    gcry_mpi_ec_mul (Q, tmp, G, ctx);
-    gcry_mpi_release (tmp);
-    gcry_mpi_point_get (x, y, z, Q);
-    if (gcry_mpi_cmp_ui (x, 0) || gcry_mpi_cmp_ui (y, 0)
-        || gcry_mpi_cmp_ui (z, 0))
-      fail ("multiply a point by zero failed\n");
-  }
-
-  gcry_mpi_ec_mul (Q, d, G, ctx);
-  gcry_mpi_point_get (x, y, z, Q);
-  if (cmp_mpihex (x, "222D9EC717C89D047E0898C9185B033CD11C0A981EE6DC66")
-      || cmp_mpihex (y, "605DE0A82D70D3E0F84A127D0739ED33D657DF0D054BFDE8")
-      || cmp_mpihex (z, "00B06B519071BC536999AC8F2D3934B3C1FC9EACCD0A31F88F"))
-    fail ("computed public key does not match\n");
-  if (debug)
-    {
-      print_mpi ("Q.x", x);
-      print_mpi ("Q.y", y);
-      print_mpi ("Q.z", z);
-    }
-
-  if (gcry_mpi_ec_get_affine (x, y, Q, ctx))
-    fail ("failed to get affine coordinates\n");
-  if (cmp_mpihex (x, "008532093BA023F4D55C0424FA3AF9367E05F309DC34CDC3FE")
-      || cmp_mpihex (y, "00C13CA9E617C6C8487BFF6A726E3C4F277913D97117939966"))
-    fail ("computed affine coordinates of public key do not match\n");
-  if (debug)
-    {
-      print_mpi ("q.x", x);
-      print_mpi ("q.y", y);
-    }
-
-  gcry_mpi_release (z);
-  gcry_mpi_release (y);
-  gcry_mpi_release (x);
-  gcry_mpi_point_release (Q);
-  gcry_mpi_release (d);
-  gcry_mpi_point_release (G);
-  gcry_mpi_release (A);
-  gcry_mpi_release (P);
-  gcry_ctx_release (ctx);
-}
-
-
-/* Check the math used with Twisted Edwards curves.  */
-static void
-twistededwards_math (void)
-{
-  gpg_error_t err;
-  gcry_ctx_t ctx;
-  gcry_mpi_point_t G, Q;
-  gcry_mpi_t k;
-  gcry_mpi_t w, a, x, y, z, p, n, b, I;
-
-  wherestr = "twistededwards_math";
-  show ("checking basic Twisted Edwards math\n");
-
-  err = gcry_mpi_ec_new (&ctx, NULL, "Ed25519");
-  if (err)
-    die ("gcry_mpi_ec_new failed: %s\n", gpg_strerror (err));
-
-  k = hex2mpi
-    ("2D3501E723239632802454EE5DDC406EFB0BDF18486A5BDE9C0390A9C2984004"
-     "F47252B628C953625B8DEB5DBCB8DA97AA43A1892D11FA83596F42E0D89CB1B6");
-  G = gcry_mpi_ec_get_point ("g", ctx, 1);
-  if (!G)
-    die ("gcry_mpi_ec_get_point(G) failed\n");
-  Q = gcry_mpi_point_new (0);
-
-
-  w = gcry_mpi_new (0);
-  a = gcry_mpi_new (0);
-  x = gcry_mpi_new (0);
-  y = gcry_mpi_new (0);
-  z = gcry_mpi_new (0);
-  I = gcry_mpi_new (0);
-  p = gcry_mpi_ec_get_mpi ("p", ctx, 1);
-  n = gcry_mpi_ec_get_mpi ("n", ctx, 1);
-  b = gcry_mpi_ec_get_mpi ("b", ctx, 1);
-
-  /* Check: 2^{p-1} mod p == 1 */
-  gcry_mpi_sub_ui (a, p, 1);
-  gcry_mpi_powm (w, GCRYMPI_CONST_TWO, a, p);
-  if (gcry_mpi_cmp_ui (w, 1))
-    fail ("failed assertion: 2^{p-1} mod p == 1\n");
-
-  /* Check: p % 4 == 1 */
-  gcry_mpi_mod (w, p, GCRYMPI_CONST_FOUR);
-  if (gcry_mpi_cmp_ui (w, 1))
-    fail ("failed assertion: p % 4 == 1\n");
-
-  /* Check: 2^{n-1} mod n == 1 */
-  gcry_mpi_sub_ui (a, n, 1);
-  gcry_mpi_powm (w, GCRYMPI_CONST_TWO, a, n);
-  if (gcry_mpi_cmp_ui (w, 1))
-    fail ("failed assertion: 2^{n-1} mod n == 1\n");
-
-  /* Check: b^{(p-1)/2} mod p == p-1 */
-  gcry_mpi_sub_ui (a, p, 1);
-  gcry_mpi_div (x, NULL, a, GCRYMPI_CONST_TWO, -1);
-  gcry_mpi_powm (w, b, x, p);
-  gcry_mpi_abs (w);
-  if (gcry_mpi_cmp (w, a))
-    fail ("failed assertion: b^{(p-1)/2} mod p == p-1\n");
-
-  /* I := 2^{(p-1)/4} mod p */
-  gcry_mpi_sub_ui (a, p, 1);
-  gcry_mpi_div (x, NULL, a, GCRYMPI_CONST_FOUR, -1);
-  gcry_mpi_powm (I, GCRYMPI_CONST_TWO, x, p);
-
-  /* Check: I^2 mod p == p-1 */
-  gcry_mpi_powm (w, I, GCRYMPI_CONST_TWO, p);
-  if (gcry_mpi_cmp (w, a))
-    fail ("failed assertion: I^2 mod p == p-1\n");
-
-  /* Check: G is on the curve */
-  if (!gcry_mpi_ec_curve_point (G, ctx))
-    fail ("failed assertion: G is on the curve\n");
-
-  /* Check: nG == (0,1) */
-  gcry_mpi_ec_mul (Q, n, G, ctx);
-  if (gcry_mpi_ec_get_affine (x, y, Q, ctx))
-    fail ("failed to get affine coordinates\n");
-  if (gcry_mpi_cmp_ui (x, 0) || gcry_mpi_cmp_ui (y, 1))
-    fail ("failed assertion: nG == (0,1)\n");
-
-  /* Now two arbitrary point operations taken from the ed25519.py
-     sample data.  */
-  gcry_mpi_release (a);
-  a = hex2mpi
-    ("4f71d012df3c371af3ea4dc38385ca5bb7272f90cb1b008b3ed601c76de1d496"
-     "e30cbf625f0a756a678d8f256d5325595cccc83466f36db18f0178eb9925edd3");
-  gcry_mpi_ec_mul (Q, a, G, ctx);
-  if (gcry_mpi_ec_get_affine (x, y, Q, ctx))
-    fail ("failed to get affine coordinates\n");
-  if (cmp_mpihex (x, ("157f7361c577aad36f67ed33e38dc7be"
-                      "00014fecc2165ca5cee9eee19fe4d2c1"))
-      || cmp_mpihex (y, ("5a69dbeb232276b38f3f5016547bb2a2"
-                         "4025645f0b820e72b8cad4f0a909a092")))
-    {
-      fail ("sample point multiply failed:\n");
-      print_mpi ("r", a);
-      print_mpi ("Rx", x);
-      print_mpi ("Ry", y);
-    }
-
-  gcry_mpi_release (a);
-  a = hex2mpi
-    ("2d3501e723239632802454ee5ddc406efb0bdf18486a5bde9c0390a9c2984004"
-     "f47252b628c953625b8deb5dbcb8da97aa43a1892d11fa83596f42e0d89cb1b6");
-  gcry_mpi_ec_mul (Q, a, G, ctx);
-  if (gcry_mpi_ec_get_affine (x, y, Q, ctx))
-    fail ("failed to get affine coordinates\n");
-  if (cmp_mpihex (x, ("6218e309d40065fcc338b3127f468371"
-                      "82324bd01ce6f3cf81ab44e62959c82a"))
-      || cmp_mpihex (y, ("5501492265e073d874d9e5b81e7f8784"
-                         "8a826e80cce2869072ac60c3004356e5")))
-    {
-      fail ("sample point multiply failed:\n");
-      print_mpi ("r", a);
-      print_mpi ("Rx", x);
-      print_mpi ("Ry", y);
-    }
-
-
-  gcry_mpi_release (I);
-  gcry_mpi_release (b);
-  gcry_mpi_release (n);
-  gcry_mpi_release (p);
-  gcry_mpi_release (w);
-  gcry_mpi_release (a);
-  gcry_mpi_release (x);
-  gcry_mpi_release (y);
-  gcry_mpi_release (z);
-  gcry_mpi_point_release (Q);
-  gcry_mpi_point_release (G);
-  gcry_mpi_release (k);
-  gcry_ctx_release (ctx);
-}
-
-
-int
-main (int argc, char **argv)
-{
-
-  if (argc > 1 && !strcmp (argv[1], "--verbose"))
-    verbose = 1;
-  else if (argc > 1 && !strcmp (argv[1], "--debug"))
-    verbose = debug = 1;
-
-  if (!gcry_check_version (GCRYPT_VERSION))
-    die ("version mismatch\n");
-
-  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-  gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
-  if (debug)
-    gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u, 0);
-  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-
-  set_get_point ();
-  context_alloc ();
-  context_param ();
-  basic_ec_math ();
-  twistededwards_math ();
-
-  show ("All tests completed. Errors: %d\n", error_count);
-  return error_count ? 1 : 0;
-}

tests/smoke-test/Makefile

@@ -0,0 +1,75 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/libgcrypt/smoke-test
+#   Description: Test calls upstream test suite.
+#   Author: Ondrej Moris <omoris@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/libgcrypt/smoke-test
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Ondrej Moris <omoris@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test calls upstream test suite." >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        15m" >> $(METADATA)
+	@echo "RunFor:          libgcrypt" >> $(METADATA)
+	@echo "Requires:        libgcrypt" >> $(METADATA)
+	@echo "Requires:        nfs-utils" >> $(METADATA)
+	@echo "Requires:        rpm-build" >> $(METADATA)
+	@echo "Requires:        autoconf automake libtool" >> $(METADATA)
+	@echo "Requires:        gawk" >> $(METADATA)
+	@echo "Requires:        gcc-c++" >> $(METADATA)
+	@echo "Requires:        libgpg-error-devel" >> $(METADATA)
+	@echo "Requires:        pkgconfig texinfo fipscheck libkcapi-fipscheck" >> $(METADATA)
+	@echo "Requires:        crypto-policies-scripts" >> $(METADATA)
+	@echo "Requires:        bc" >> $(METADATA)
+	@echo "RhtsRequires:    library(distribution/fips)" >> $(METADATA)
+	@echo "Releases:        -RHEL3 -RHEL4" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "Architectures:   i386 x86_64 s390x ia64" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/smoke-test/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/libgcrypt/Sanity/smoke-test
+Description: Test calls upstream test suite.
+Author: Ondrej Moris <omoris@redhat.com>

tests/smoke-test/main.fmf

@@ -0,0 +1,25 @@
+summary: Test calls upstream test suite.
+test: ./runtest.sh
+enabled: true
+framework: beakerlib
+require:
+  - library(distribution/fips)
+recommend:
+  - libgcrypt
+  - nfs-utils
+  - rpm-build
+  - autoconf
+  - automake
+  - libtool
+  - gawk
+  - gcc-c++
+  - libgpg-error-devel
+  - pkgconfig
+  - texinfo
+  - fipscheck
+  - libkcapi-fipscheck
+  - crypto-policies-scripts
+  - bc
+  - annobin-annocheck
+  - gnupg2
+duration: 45m

tests/smoke-test/runtest.sh

@@ -0,0 +1,145 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/libgcrypt/smoke-test
+#   Description: Test calls upstream test suite.
+#   Author: Ondrej Moris <omoris@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+. /usr/share/beakerlib/beakerlib.sh
+
+PACKAGE="libgcrypt"
+
+rlJournalStart
+
+    rlPhaseStartSetup
+        rlImport distribution/fips || rlFail "FIPS library needed for some phases"
+        TmpDir=`mktemp -d`
+        rlAssertRpm $PACKAGE
+        rlRun "rlFileBackup --clean /etc/gcrypt/fips_enabled"
+        if [[ -r /etc/gcrypt/hwf.deny ]]; then
+            rlRun "rlFileBackup /etc/gcrypt/hwf.deny"
+            rlRun "rm -f /etc/gcrypt/hwf.deny"
+        fi
+        rlRun "pushd $TmpDir" 0
+        rlRun "rlFetchSrcForInstalled $PACKAGE"
+        rlRun "rpm -ihv `ls *.rpm`" 0
+        if grep '1' /proc/sys/crypto/fips_enabled; then
+            rlRun "echo '1' > /etc/gcrypt/fips_enabled" 0
+        fi
+    rlPhaseEnd
+
+    rlPhaseStartTest "Package build"
+        TOPDIR=`rpm --eval %_topdir`
+        rlRun "pushd $TOPDIR" 0
+        rlRun "rm -rf BUILD/libgcrypt-*" 0-255
+        rlRun "rpmbuild -vv -bc SPECS/libgcrypt.spec" 0
+        libgcrypt_dir="libgcrypt-`rpm -q --qf "%{VERSION}\n" libgcrypt | head -1`"
+        if [ -d "BUILD/$libgcrypt_dir-build" ]; then
+            BUILDDIR="BUILD/$libgcrypt_dir-build/$libgcrypt_dir"
+        else
+            BUILDDIR="BUILD/$libgcrypt_dir"
+        fi
+        rlRun "pushd $BUILDDIR" 0
+        rlRun "fipshmac src/.libs/libgcrypt.so.??" 0
+        rlRun "popd"
+        rlRun "popd"
+    rlPhaseEnd
+
+    rlPhaseStartTest "Upstream testsuite"
+        rlRun "pushd $TOPDIR/$BUILDDIR" 0
+        exp_fails=()
+
+        rlRun "echo 'Expecting ${#exp_fails[@]} fails'"
+        exp_exitcode=0
+        if [[ ${#exp_fails[@]} -gt 0 ]]; then exp_exitcode=2; fi
+        rlRun "make check &> $TmpDir/make_check.out" $exp_exitcode
+        rlRun "grep ^FAIL: $TmpDir/make_check.out" 0,1 "Print fails"
+        if [[ ${#exp_fails[@]} -gt 0 ]]; then
+            for f in $(grep '^FAIL:' $TmpDir/make_check.out | awk -F ': ' '{print $2}'); do
+                if [[ "${exp_fails[@]}" =~ "$f" ]]; then
+                    rlLog "$f failure is expected"
+                else
+                    rlFail "$f failure is not expected"
+                fi
+            done
+        else
+            rlRun "grep \"All [0-9]\+ tests passed\" $TmpDir/make_check.out" 0 \
+                "All tests passed"
+        fi
+        rlRun "cat $TmpDir/make_check.out"
+        rlRun "popd"
+    rlPhaseEnd
+
+    if ! (rlIsRHEL '<=8.4' || ([[ $fipsMode = "enabled" ]] &&  rlIsFedora '<37')); then
+    # (we are ~expecting to fix HW optimization problem around Fedora-37)
+    rlPhaseStartTest "Performance with HW optimizations disabled - bz1990059"
+        # we are gathering more samples, so that this test is robust in shared environments
+        N_SAMPLES=5
+        N_MEDIAN=$(echo "$N_SAMPLES/2+1" |bc)
+        HWF_DENY_FILE="/etc/gcrypt/hwf.deny"
+        # Disabling via cmdline arguments would need either handpicking
+        # all the algorithms (variant with ":"), or making "all" work.
+        # "--disable-hwf all" does not work: https://dev.gnupg.org/T5636
+        #dis_arg="--disable-hwf all"
+        dis_arg=""
+
+        for x in "cipher:aes256:CBC enc" "hash:sha256:SHA256" "mac:hmac_sha256:HMAC_SHA256"; do
+            alg_type=$(echo $x |cut -d: -f1)
+            algorithm=$(echo $x |cut -d: -f2)
+            alg_line=$(echo $x |cut -d: -f3)
+            rlRun "rm -f $algorithm.ena $algorithm.dis"
+            rlLogInfo "Performance measurements started ..."
+            for i in `seq 1 $N_SAMPLES`; do
+                # run with HW optimizations ENAbled
+                rm -f $HWF_DENY_FILE
+                $TOPDIR/$BUILDDIR/tests/bench-slope $alg_type $algorithm |grep "$alg_line" >>$algorithm.ena
+
+                # run with HW optimizations DISabled
+                # this looks idiotic, but I wasn't able to make --disable-hwf work
+                echo "all" >$HWF_DENY_FILE
+                $TOPDIR/$BUILDDIR/tests/bench-slope $dis_arg $alg_type $algorithm |grep "$alg_line" >>$algorithm.dis
+            done
+            rlLogInfo "Performance measurements finished"
+            rlRun "cat $algorithm.ena"
+            rlRun "cat $algorithm.dis"
+            dis=$(cat $algorithm.dis |cut -d'|' -f2 |awk '{ print $1 }' |sort -n |sed -n "$N_MEDIAN p")
+            ena=$(cat $algorithm.ena |cut -d'|' -f2 |awk '{ print $1 }' |sort -n |sed -n "$N_MEDIAN p")
+            rlRun "echo '$algorithm Time: disabled $dis enabled $ena'"
+            if (( $(echo "$dis > $ena" |bc -l) )); then
+                rlPass "HW optimizations work for $algorithm"
+            else
+                rlFail "HW optimizations DO NOT work for $algorithm"
+            fi
+        done
+    rlPhaseEnd
+    fi
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0
+        rlRun "rlFileRestore"
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd