1.11.2-1

Resolves: #2382944

.fmf/version

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

.gitignore

@@ -28,3 +28,17 @@ libgcrypt-1.4.5-hobbled.tar.bz2
 /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,271 +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"
-
-
-#define PGM "curves"
-#include "t-common.h"
-
-/* Number of curves defined in ../cipger/ecc-curves.c */
-#define N_CURVES 20
-
-/* 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"
-"  (h #000000000000000000000000000000000000000000000000000000000000000001#)\n"
-"  (q #0442B927242237639A36CE9221B340DB1A9AB76DF2FE3E171277F6A4023DED146EE"
-      "86525E38CCECFF3FB8D152CC6334F70D23A525175C1BCBDDE6E023B2228770E#)\n"
-"  ))";
-static char const sample_key_1_curve[] = "NIST P-256";
-static unsigned int sample_key_1_nbits = 256;
-
-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)
-{
-  static struct {
-    int algo;
-    const char *name;
-    int error_expected;
-  } tv[] =
-      {
-       { GCRY_PK_ECC, "Ed25519" },
-       { GCRY_PK_ECC, "1.3.6.1.4.1.11591.15.1" },
-       { GCRY_PK_ECC, "1.3.101.112" },
-
-       { GCRY_PK_ECC, "Curve25519" },
-       { GCRY_PK_ECC, "1.3.6.1.4.1.3029.1.5.1" },
-       { GCRY_PK_ECC, "1.3.101.110" },
-       { GCRY_PK_ECC, "X25519" },
-
-       { GCRY_PK_ECC, "Ed448" },
-       { GCRY_PK_ECC, "X448"  },
-       { GCRY_PK_ECC, "1.3.101.113" },
-       { GCRY_PK_ECC, "1.3.101.111" },
-
-       { GCRY_PK_ECC, "NIST P-192" },
-       { GCRY_PK_ECC, "1.2.840.10045.3.1.1" },
-       { GCRY_PK_ECC,  "prime192v1" },
-       { GCRY_PK_ECC,  "secp192r1"  },
-       { GCRY_PK_ECC,  "nistp192"   },
-
-       { GCRY_PK_ECC, "NIST P-224" },
-       { GCRY_PK_ECC, "secp224r1"  },
-       { GCRY_PK_ECC, "1.3.132.0.33" },
-       { GCRY_PK_ECC, "nistp224"   },
-
-       { GCRY_PK_ECC, "NIST P-256" },
-       { GCRY_PK_ECC, "1.2.840.10045.3.1.7" },
-       { GCRY_PK_ECC, "prime256v1" },
-       { GCRY_PK_ECC, "secp256r1" },
-       { GCRY_PK_ECC, "nistp256"  },
-
-       { GCRY_PK_ECC, "NIST P-384" },
-       { GCRY_PK_ECC, "secp384r1" },
-       { GCRY_PK_ECC, "1.3.132.0.34" },
-       { GCRY_PK_ECC, "nistp384"   },
-
-       { GCRY_PK_ECC, "NIST P-521" },
-       { GCRY_PK_ECC, "secp521r1" },
-       { GCRY_PK_ECC, "1.3.132.0.35" },
-       { GCRY_PK_ECC, "nistp521"   },
-
-       { GCRY_PK_ECC, "GOST2001-test" },
-       { GCRY_PK_ECC, "1.2.643.2.2.35.0" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-A" },
-       { GCRY_PK_ECC, "1.2.643.2.2.35.1" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-B" },
-       { GCRY_PK_ECC, "1.2.643.2.2.35.2" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-C" },
-       { GCRY_PK_ECC, "1.2.643.2.2.35.3" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-A" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-XchA" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-C" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-XchB" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-A" },
-       { GCRY_PK_ECC, "1.2.643.2.2.36.0" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-C" },
-       { GCRY_PK_ECC, "1.2.643.2.2.36.1" },
-
-       /* Noet that GOST2012-256-tc26-A" is only in the curve alias
-        * list but has no parameter entry.  */
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-A" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.1.2" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-A" },
-       { GCRY_PK_ECC, "GOST2012-256-tc26-B" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-B" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.1.3" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-B" },
-       { GCRY_PK_ECC, "GOST2012-256-tc26-C" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-C" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.1.4" },
-       { GCRY_PK_ECC, "GOST2001-CryptoPro-C" },
-       { GCRY_PK_ECC, "GOST2012-256-tc26-D" },
-
-       { GCRY_PK_ECC, "GOST2012-512-test" },
-       { GCRY_PK_ECC, "GOST2012-test" },
-       { GCRY_PK_ECC, "GOST2012-512-test" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.2.0" },
-       { GCRY_PK_ECC, "GOST2012-512-tc26-A" },
-       { GCRY_PK_ECC, "GOST2012-tc26-A" },
-       { GCRY_PK_ECC, "GOST2012-512-tc26-B" },
-       { GCRY_PK_ECC, "GOST2012-tc26-B" },
-       { GCRY_PK_ECC, "GOST2012-512-tc26-A" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.2.1" },
-       { GCRY_PK_ECC, "GOST2012-512-tc26-B" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.2.2" },
-       { GCRY_PK_ECC, "GOST2012-512-tc26-C" },
-       { GCRY_PK_ECC, "1.2.643.7.1.2.1.2.3" },
-
-       { GCRY_PK_ECC, "secp256k1" },
-       { GCRY_PK_ECC, "1.3.132.0.10" },
-
-       { GCRY_PK_ECC, "sm2p256v1" },
-       { GCRY_PK_ECC, "1.2.156.10197.1.301" },
-
-       /* Check also the ECC algo mapping.  */
-       { GCRY_PK_ECDSA, "Ed25519" },
-       { GCRY_PK_EDDSA, "Ed25519" },
-       { GCRY_PK_ECDH,  "Ed25519" },
-       { GCRY_PK_ECDSA, "Curve25519" },
-       { GCRY_PK_EDDSA, "Curve25519" },
-       { GCRY_PK_ECDH,  "Curve25519" },
-       { GCRY_PK_ECC,   "NoSuchCurve", 1 },
-       { GCRY_PK_RSA,   "rsa", 1 },
-       { GCRY_PK_ELG,   "elg", 1 },
-       { GCRY_PK_DSA,   "dsa", 1 }
-      };
-  int idx;
-  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);
-
-  /* Some simple tests */
-  for (idx=0; idx < DIM (tv); idx++)
-    {
-      param = gcry_pk_get_param (tv[idx].algo, tv[idx].name);
-      if (!param)
-        {
-          if (!tv[idx].error_expected)
-            fail ("get_param: test %d (%s) failed\n", idx, tv[idx].name);
-        }
-      else
-        {
-          if (tv[idx].error_expected)
-            fail ("get_param: test %d (%s) failed (error expected)\n",
-                  idx, tv[idx].name);
-        }
-      gcry_sexp_release (param);
-    }
-}
-
-
-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");
-
-  xgcry_control ((GCRYCTL_DISABLE_SECMEM, 0));
-  xgcry_control ((GCRYCTL_INITIALIZATION_FINISHED, 0));
-  if (debug)
-    xgcry_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/keygrip.c

keygrip.c

@@ -1,341 +0,0 @@
-/* keygrip.c - verifies that keygrips are calculated as expected
- *	Copyright (C) 2005 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 <assert.h>
-
-#define PGM "keygrip"
-#include "t-common.h"
-
-static int repetitions;
-
-
-
-static void
-print_hex (const char *text, const void *buf, size_t n)
-{
-  const unsigned char *p = buf;
-
-  fputs (text, stdout);
-  for (; n; n--, p++)
-    printf ("%02X", *p);
-  putchar ('\n');
-}
-
-
-
-
-static struct
-{
-  int algo;
-  const char *key;
-  const unsigned char grip[20];
-} key_grips[] =
-  {
-    {
-      GCRY_PK_RSA,
-      "(private-key"
-      " (rsa"
-      "  (n #00B6B509596A9ECABC939212F891E656A626BA07DA8521A9CAD4C08E640C04052FBB87F424EF1A0275A48A9299AC9DB69ABE3D0124E6C756B1F7DFB9B842D6251AEA6EE85390495CADA73D671537FCE5850A932F32BAB60AB1AC1F852C1F83C625E7A7D70CDA9EF16D5C8E47739D77DF59261ABE8454807FF441E143FBD37F8545#)"
-      "  (e #010001#)"
-      "  (d #077AD3DE284245F4806A1B82B79E616FBDE821C82D691A65665E57B5FAD3F34E67F401E7BD2E28699E89D9C496CF821945AE83AC7A1231176A196BA6027E77D85789055D50404A7A2A95B1512F91F190BBAEF730ED550D227D512F89C0CDB31AC06FA9A19503DDF6B66D0B42B9691BFD6140EC1720FFC48AE00C34796DC899E5#)"
-      "  (p #00D586C78E5F1B4BF2E7CD7A04CA091911706F19788B93E44EE20AAF462E8363E98A72253ED845CCBF2481BB351E8557C85BCFFF0DABDBFF8E26A79A0938096F27#)"
-      "  (q #00DB0CDF60F26F2A296C88D6BF9F8E5BE45C0DDD713C96CC73EBCB48B061740943F21D2A93D6E42A7211E7F02A95DCED6C390A67AD21ECF739AE8A0CA46FF2EBB3#)"
-      "  (u #33149195F16912DB20A48D020DBC3B9E3881B39D722BF79378F6340F43148A6E9FC5F53E2853B7387BA4443BA53A52FCA8173DE6E85B42F9783D4A7817D0680B#)))",
-      "\x32\xCF\xFA\x85\xB1\x79\x1F\xBB\x26\x14\xE9\x1A\xFD\xF3\xAF\xE3\x32\x08\x2E\x25"
-    },
-    {
-      GCRY_PK_DSA,
-      " (public-key"
-      " (dsa"
-      "  (p #0084E4C626E16005770BD9509ABF7354492E85B8C0060EFAAAEC617F725B592FAA59DF5460575F41022776A9718CE62EDD542AB73C7720869EBDBC834D174ADCD7136827DF51E2613545A25CA573BC502A61B809000B6E35F5EB7FD6F18C35678C23EA1C3638FB9CFDBA2800EE1B62F41A4479DE824F2834666FBF8DC5B53C2617#)"
-      "  (q #00B0E6F710051002A9F425D98A677B18E0E5B038AB#)"
-      "  (g #44370CEE0FE8609994183DBFEBA7EEA97D466838BCF65EFF506E35616DA93FA4E572A2F08886B74977BC00CA8CD3DBEA7AEB7DB8CBB180E6975E0D2CA76E023E6DE9F8CCD8826EBA2F72B8516532F6001DEFFAE76AA5E59E0FA33DBA3999B4E92D1703098CDEDCC416CF008801964084CDE1980132B2B78CB4CE9C15A559528B#)"
-      "  (y #3D5DD14AFA2BF24A791E285B90232213D0E3BA74AB1109E768AED19639A322F84BB7D959E2BA92EF73DE4C7F381AA9F4053CFA3CD4527EF9043E304E5B95ED0A3A5A9D590AA641C13DB2B6E32B9B964A6A2C730DD3EA7C8E13F7A140AFF1A91CE375E9B9B960384779DC4EA180FA1F827C52288F366C0770A220F50D6D8FD6F6#)))",
-      "\x04\xA3\x4F\xA0\x2B\x03\x94\xD7\x32\xAD\xD5\x9B\x50\xAF\xDB\x5D\x57\x22\xA6\x10"
-
-    },
-    {
-      GCRY_PK_DSA,
-      "(private-key"
-      " (dsa"
-      "  (p #0084E4C626E16005770BD9509ABF7354492E85B8C0060EFAAAEC617F725B592FAA59DF5460575F41022776A9718CE62EDD542AB73C7720869EBDBC834D174ADCD7136827DF51E2613545A25CA573BC502A61B809000B6E35F5EB7FD6F18C35678C23EA1C3638FB9CFDBA2800EE1B62F41A4479DE824F2834666FBF8DC5B53C2617#)"
-      "  (q #00B0E6F710051002A9F425D98A677B18E0E5B038AB#)"
-      "  (g #44370CEE0FE8609994183DBFEBA7EEA97D466838BCF65EFF506E35616DA93FA4E572A2F08886B74977BC00CA8CD3DBEA7AEB7DB8CBB180E6975E0D2CA76E023E6DE9F8CCD8826EBA2F72B8516532F6001DEFFAE76AA5E59E0FA33DBA3999B4E92D1703098CDEDCC416CF008801964084CDE1980132B2B78CB4CE9C15A559528B#)"
-      "  (y #3D5DD14AFA2BF24A791E285B90232213D0E3BA74AB1109E768AED19639A322F84BB7D959E2BA92EF73DE4C7F381AA9F4053CFA3CD4527EF9043E304E5B95ED0A3A5A9D590AA641C13DB2B6E32B9B964A6A2C730DD3EA7C8E13F7A140AFF1A91CE375E9B9B960384779DC4EA180FA1F827C52288F366C0770A220F50D6D8FD6F6#)"
-      "  (x #0087F9E91BFBCC1163DE71ED86D557708E32F8ADDE#)))",
-      "\x04\xA3\x4F\xA0\x2B\x03\x94\xD7\x32\xAD\xD5\x9B\x50\xAF\xDB\x5D\x57\x22\xA6\x10"
-    },
-    {
-      GCRY_PK_ECDSA,
-      "(public-key"
-      " (ecdsa(flags param)"
-      " (p #00FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF#)"
-      " (a #00FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC#)"
-      " (b #5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B#)"
-      " (g #046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5#)"
-      " (n #00FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551#)"
-      " (h #000000000000000000000000000000000000000000000000000000000000000001#)"
-      " (q #04C8A4CEC2E9A9BC8E173531A67B0840DF345C32E261ADD780E6D83D56EFADFD5DE872F8B854819B59543CE0B7F822330464FBC4E6324DADDCD9D059554F63B344#)))",
-      "\xE6\xDF\x94\x2D\xBD\x8C\x77\x05\xA3\xDD\x41\x6E\xFC\x04\x01\xDB\x31\x0E\x99\xB6"
-    },
-    {
-      GCRY_PK_ECDSA,
-      "(public-key"
-      " (ecdsa(flags param)"
-      " (p #00FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF#)"
-      " (curve \"NIST P-256\")"
-      " (b #5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B#)"
-      " (g #046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5#)"
-      " (n #00FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551#)"
-      " (h #000000000000000000000000000000000000000000000000000000000000000001#)"
-      " (q #04C8A4CEC2E9A9BC8E173531A67B0840DF345C32E261ADD780E6D83D56EFADFD5DE872F8B854819B59543CE0B7F822330464FBC4E6324DADDCD9D059554F63B344#)))",
-      "\xE6\xDF\x94\x2D\xBD\x8C\x77\x05\xA3\xDD\x41\x6E\xFC\x04\x01\xDB\x31\x0E\x99\xB6"
-    },
-    {
-      GCRY_PK_ECDSA,
-      "(public-key"
-      " (ecdsa"
-      " (p #00FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF#)"
-      " (curve \"NIST P-256\")"
-      " (b #5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B#)"
-      " (g #046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5#)"
-      " (n #00FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551#)"
-      " (h #000000000000000000000000000000000000000000000000000000000000000001#)"
-      " (q #04C8A4CEC2E9A9BC8E173531A67B0840DF345C32E261ADD780E6D83D56EFADFD5DE872F8B854819B59543CE0B7F822330464FBC4E6324DADDCD9D059554F63B344#)))",
-      "\xE6\xDF\x94\x2D\xBD\x8C\x77\x05\xA3\xDD\x41\x6E\xFC\x04\x01\xDB\x31\x0E\x99\xB6"
-    },
-    {
-      GCRY_PK_ECDSA,
-      "(public-key"
-      " (ecdsa"
-      " (curve secp256r1)"
-      " (q #04C8A4CEC2E9A9BC8E173531A67B0840DF345C32E261ADD780E6D83D56EFADFD5DE872F8B854819B59543CE0B7F822330464FBC4E6324DADDCD9D059554F63B344#)))",
-      "\xE6\xDF\x94\x2D\xBD\x8C\x77\x05\xA3\xDD\x41\x6E\xFC\x04\x01\xDB\x31\x0E\x99\xB6"
-    },
-    {
-      GCRY_PK_ECC,
-      "(public-key"
-      " (ecc"
-      " (curve secp256r1)"
-      " (q #04C8A4CEC2E9A9BC8E173531A67B0840DF345C32E261ADD780E6D83D56EFADFD5DE872F8B854819B59543CE0B7F822330464FBC4E6324DADDCD9D059554F63B344#)))",
-      "\xE6\xDF\x94\x2D\xBD\x8C\x77\x05\xA3\xDD\x41\x6E\xFC\x04\x01\xDB\x31\x0E\x99\xB6"
-    },
-    { /* Ed25519 standard */
-      GCRY_PK_ECC,
-      "(public-key"
-      " (ecc"
-      " (curve Ed25519)"
-      " (q #04"
-      "     1CC662926E7EFF4982B7FB8B928E61CD74CCDD85277CC57196C3AD20B611085F"
-      "     47BD24842905C049257673B3F5249524E0A41FAA17B25B818D0F97E625F1A1D0#)"
-      "     ))",
-      "\x0C\xCA\xB2\xFD\x48\x9A\x33\x40\x2C\xE8"
-      "\xE0\x4A\x1F\xB2\x45\xEA\x80\x3D\x0A\xF1"
-    },
-    { /* Ed25519+EdDSA */
-      GCRY_PK_ECC,
-      "(public-key"
-      " (ecc"
-      " (curve Ed25519)(flags eddsa)"
-      " (q #773E72848C1FD5F9652B29E2E7AF79571A04990E96F2016BF4E0EC1890C2B7DB#)"
-      " ))",
-      "\x9D\xB6\xC6\x4A\x38\x83\x0F\x49\x60\x70"
-      "\x17\x89\x47\x55\x20\xBE\x8C\x82\x1F\x47"
-    },
-    { /* Ed25519+EdDSA (with compression prefix) */
-      GCRY_PK_ECC,
-      "(public-key"
-      " (ecc"
-      " (curve Ed25519)(flags eddsa)"
-      " (q #40"
-      "     773E72848C1FD5F9652B29E2E7AF79571A04990E96F2016BF4E0EC1890C2B7DB#)"
-      " ))",
-      "\x9D\xB6\xC6\x4A\x38\x83\x0F\x49\x60\x70"
-      "\x17\x89\x47\x55\x20\xBE\x8C\x82\x1F\x47"
-    },
-    { /* Ed25519+EdDSA  (same but uncompressed)*/
-      GCRY_PK_ECC,
-      "(public-key"
-      " (ecc"
-      " (curve Ed25519)(flags eddsa)"
-      " (q #04"
-      "     629ad237d1ed04dcd4abe1711dd699a1cf51b1584c4de7a4ef8b8a640180b26f"
-      "     5bb7c29018ece0f46b01f2960e99041a5779afe7e2292b65f9d51f8c84723e77#)"
-      " ))",
-      "\x9D\xB6\xC6\x4A\x38\x83\x0F\x49\x60\x70"
-      "\x17\x89\x47\x55\x20\xBE\x8C\x82\x1F\x47"
-    },
-    { /* Cv25519 */
-      GCRY_PK_ECC,
-      "(public-key"
-      " (ecc"
-      " (curve Curve25519)(flags djb-tweak)"
-      " (q #40"
-      "     918C1733127F6BF2646FAE3D081A18AE77111C903B906310B077505EFFF12740#)"
-      " ))",
-      "\x0F\x89\xA5\x65\xD3\xEA\x18\x7C\xE8\x39"
-      "\x33\x23\x98\xF5\xD4\x80\x67\x7D\xF4\x9C"
-    },
-    { /* Random key  */
-      GCRY_PK_RSA,
-      "(shadowed-private-key"
-      " (rsa"
-      " (n #00B493C79928398DA9D99AC0E949FE6EB62F683CB974FFFBFBC01066F5C9A89B"
-      "     D3DC48EAD7C65F36EA943C2B2C865C26C4884FF9EDFDA8C99C855B737D77EEF6"
-      "     B85DBC0CCEC0E900C1F89A6893A2A93E8B31028469B6927CEB2F08687E547C68"
-      "     6B0A2F7E50A194FF7AB7637E03DE0912EF7F6E5F1EC37625BD1620CCC2E7A564"
-      "     31E168CDAFBD1D9E61AE47A69A6FA03EF22F844528A710B2392F262B95A3078C"
-      "     F321DC8325F92A5691EF69F34FD0DE0B22C79D29DC87723FCADE463829E8E5F7"
-      "     D196D73D6C9C180F6A6A0DDBF7B9D8F7FA293C36163B12199EF6A1A95CAE4051"
-      "     E3069C522CC6C4A7110F663A5DAD20F66C13A1674D050088208FAE4F33B3AB51"
-      "     03#)"
-      " (e #00010001#)"
-      " (shadowed t1-v1"
-      " (#D2760001240102000005000123350000# OPENPGP.1)"
-      ")))",
-      "\xE5\x6E\xE6\xEE\x5A\x2F\xDC\x3E\x98\x9D"
-      "\xFE\x49\xDA\xF5\x67\x43\xE3\x27\x28\x33"
-    }
-  };
-
-
-static void
-check (void)
-{
-  unsigned char buf[20];
-  unsigned char *ret;
-  gcry_error_t err;
-  gcry_sexp_t sexp;
-  unsigned int i;
-  int repn;
-
-  for (i = 0; i < (sizeof (key_grips) / sizeof (*key_grips)); i++)
-    {
-      if (gcry_pk_test_algo (key_grips[i].algo))
-        {
-          if (verbose)
-            fprintf (stderr, "algo %d not available; test skipped\n",
-                     key_grips[i].algo);
-          continue;
-        }
-      err = gcry_sexp_sscan (&sexp, NULL, key_grips[i].key,
-			     strlen (key_grips[i].key));
-      if (err)
-        die ("scanning data %d failed: %s\n", i, gpg_strerror (err));
-
-      if (debug)
-        info ("check(%d): s-exp='%s'\n", i, key_grips[i].key);
-
-      for (repn=0; repn < repetitions; repn++)
-        {
-          ret = gcry_pk_get_keygrip (sexp, buf);
-          if (!ret)
-            die ("gcry_pk_get_keygrip failed for %d\n", i);
-
-          if ( memcmp (key_grips[i].grip, buf, sizeof (buf)) )
-            {
-              print_hex ("keygrip: ", buf, sizeof buf);
-              die ("keygrip for %d does not match\n", i);
-            }
-          else if (debug && !repn)
-            print_hex ("keygrip: ", buf, sizeof buf);
-        }
-
-      gcry_sexp_release (sexp);
-    }
-}
-
-
-
-static void
-progress_handler (void *cb_data, const char *what, int printchar,
-		  int current, int total)
-{
-  (void)cb_data;
-  (void)what;
-  (void)current;
-  (void)total;
-
-  putchar (printchar);
-}
-
-int
-main (int argc, char **argv)
-{
-  int last_argc = -1;
-
-  if (argc)
-    { argc--; argv++; }
-
-  while (argc && last_argc != argc )
-    {
-      last_argc = argc;
-      if (!strcmp (*argv, "--"))
-        {
-          argc--; argv++;
-          break;
-        }
-      else if (!strcmp (*argv, "--verbose"))
-        {
-          verbose = 1;
-          argc--; argv++;
-        }
-      else if (!strcmp (*argv, "--debug"))
-        {
-          verbose = 1;
-          debug = 1;
-          argc--; argv++;
-        }
-      else if (!strcmp (*argv, "--repetitions"))
-        {
-          argc--; argv++;
-          if (argc)
-            {
-              repetitions = atoi(*argv);
-              argc--; argv++;
-            }
-        }
-    }
-
-  if (repetitions < 1)
-    repetitions = 1;
-
-  if (!gcry_check_version (GCRYPT_VERSION))
-    die ("version mismatch\n");
-
-  gcry_set_progress_handler (progress_handler, NULL);
-
-  xgcry_control ((GCRYCTL_DISABLE_SECMEM, 0));
-  xgcry_control ((GCRYCTL_INITIALIZATION_FINISHED, 0));
-  if (debug)
-    xgcry_control ((GCRYCTL_SET_DEBUG_FLAGS, 1u, 0));
-
-  check ();
-
-  return 0;
-}

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-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.8.3-fips-ctor.patch

@@ -1,73 +0,0 @@
-diff -up libgcrypt-1.8.3/src/global.c.fips-ctor libgcrypt-1.8.3/src/global.c
---- libgcrypt-1.8.3/src/global.c.fips-ctor	2017-11-23 19:25:58.000000000 +0100
-+++ libgcrypt-1.8.3/src/global.c	2020-04-17 16:29:59.258218015 +0200
-@@ -141,6 +141,34 @@ 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();
-+      _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
-@@ -671,8 +699,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;
- 
-@@ -749,9 +776,9 @@ _gcry_vcontrol (enum gcry_ctl_cmds cmd,
-       break;
- 
-     case GCRYCTL_SET_ENFORCED_FIPS_FLAG:
--      if (!_gcry_global_any_init_done)
-+      if (fips_mode ())
-         {
--          /* Not yet initialized at all.  Set the enforced fips mode flag */
-+          /* We are in FIPS mode, we can set the enforced fips mode flag. */
-           _gcry_set_preferred_rng_type (0);
-           _gcry_set_enforced_fips_mode ();
-         }
-diff --git a/tests/t-secmem.c b/tests/t-secmem.c
-index 2b769134..1d33bbfd 100644
---- a/tests/t-secmem.c
-+++ b/tests/t-secmem.c
-@@ -54,7 +54,7 @@ test_secmem (void)
- 
-   /* Allocating another 2k should fail for the default 16k pool.  */
-   b = gcry_malloc_secure (chunk_size*4);
--  if (b)
-+  if (b && !gcry_fips_mode_active ())
-     fail ("allocation did not fail as expected\n");
- 
-   for (i=0; i < DIM(a); i++)

libgcrypt-1.8.3-fips-enttest.patch

@@ -1,113 +0,0 @@
-diff -up libgcrypt-1.8.3/random/random-drbg.c.fips-enttest libgcrypt-1.8.3/random/random-drbg.c
---- libgcrypt-1.8.3/random/random-drbg.c.fips-enttest	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.3/random/random-drbg.c	2019-06-24 10:04:23.219547141 +0200
-@@ -317,6 +317,7 @@ struct drbg_state_s
-   gcry_cipher_hd_t ctr_handle;	/* CTR mode cipher handle */
-   int seeded:1;			/* DRBG fully seeded? */
-   int pr:1;			/* Prediction resistance enabled? */
-+  int ent_primed:1;             /* Previous entropy data primed? */
-   /* Taken from libgcrypt ANSI X9.31 DRNG: We need to keep track of the
-    * process which did the initialization so that we can detect a fork.
-    * The volatile modifier is required so that the compiler does not
-@@ -324,6 +325,7 @@ struct drbg_state_s
-   pid_t seed_init_pid;
-   const struct drbg_state_ops_s *d_ops;
-   const struct drbg_core_s *core;
-+  unsigned char ent_hash[64];	/* Hash of previous entropy data */
-   struct drbg_test_data_s *test_data;
- };
- 
-@@ -610,11 +612,13 @@ drbg_get_entropy (drbg_state_t drbg, uns
- 		       size_t len)
- {
-   int rc = 0;
-+  unsigned char newhash[64];
- 
-   /* Perform testing as defined in 11.3.2 */
-   if (drbg->test_data && drbg->test_data->fail_seed_source)
-     return -1;
- 
-+redo:
-   read_cb_buffer = buffer;
-   read_cb_size = len;
-   read_cb_len = 0;
-@@ -634,6 +638,27 @@ drbg_get_entropy (drbg_state_t drbg, uns
- #else
-   rc = -1;
- #endif
-+
-+  /* to avoid storing the actual entropy obtained for indefinite
-+     time, we just store the SHA-512 hash of the entropy gathered
-+   */
-+  _gcry_md_hash_buffer (GCRY_MD_SHA512, newhash, buffer, len);
-+
-+  if (!drbg->ent_primed)
-+    {
-+      memcpy (drbg->ent_hash, newhash, sizeof (drbg->ent_hash));
-+      drbg->ent_primed = 1;
-+      goto redo;
-+    }
-+
-+  if (memcmp (newhash, drbg->ent_hash, sizeof (drbg->ent_hash)) == 0)
-+    {
-+      fips_signal_error ("Entropy source failed the continuous test");
-+      return -1;  /* continuous entropy test failed */
-+    }
-+
-+  memcpy (drbg->ent_hash, newhash, sizeof (drbg->ent_hash));
-+
-   return rc;
- }
- 
-@@ -1341,26 +1366,38 @@ drbg_seed (drbg_state_t drbg, drbg_strin
-     }
-   else
-     {
-+      int nonce = 0;
-       /* Gather entropy equal to the security strength of the DRBG.
-        * With a derivation function, a nonce is required in addition
-        * to the entropy. A nonce must be at least 1/2 of the security
-        * strength of the DRBG in size. Thus, entropy * nonce is 3/2
-        * of the strength. The consideration of a nonce is only
--       * applicable during initial seeding. */
-+       * applicable during initial seeding.
-+       * To avoid pulling different length of data from entropy
-+       * source, we use 2 * strength for initial seeding. */
-       entropylen = drbg_sec_strength (drbg->core->flags);
-       if (!entropylen)
- 	return GPG_ERR_GENERAL;
-       if (0 == reseed)
--	/* make sure we round up strength/2 in
--	 * case it is not divisible by 2 */
--	entropylen = ((entropylen + 1) / 2) * 3;
-+        {
-+	  nonce = 1;
-+        }
-       dbg (("DRBG: (re)seeding with %lu bytes of entropy\n", entropylen));
--      entropy = xcalloc_secure (1, entropylen);
-+      entropy = xcalloc_secure (nonce + 1, entropylen);
-       if (!entropy)
- 	return GPG_ERR_ENOMEM;
-       ret = drbg_get_entropy (drbg, entropy, entropylen);
-       if (ret)
- 	goto out;
-+      if (nonce)
-+        {
-+          ret = drbg_get_entropy (drbg, entropy + entropylen, entropylen);
-+          if (ret)
-+	    goto out;
-+	  /* make sure we round up strength/2 in
-+	   * case it is not divisible by 2 */
-+ 	  entropylen = 2 * entropylen;
-+        }
-       drbg_string_fill (&data1, entropy, entropylen);
-     }
- 
-@@ -1597,6 +1634,7 @@ drbg_instantiate (drbg_state_t drbg,
-   drbg->core = &drbg_cores[coreref];
-   drbg->pr = pr;
-   drbg->seeded = 0;
-+  drbg->ent_primed = 0;
-   if (drbg->core->flags & DRBG_HMAC)
-     drbg->d_ops = &drbg_hmac_ops;
-   else if (drbg->core->flags & DRBG_HASH_MASK)

libgcrypt-1.8.3-md-fips-enforce.patch

@@ -1,37 +0,0 @@
-diff -up libgcrypt-1.8.3/cipher/md.c.fips-enforce libgcrypt-1.8.3/cipher/md.c
---- libgcrypt-1.8.3/cipher/md.c.fips-enforce	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.3/cipher/md.c	2020-04-17 15:07:31.364945130 +0200
-@@ -409,13 +409,10 @@ md_enable (gcry_md_hd_t hd, int algorith
-     }
- 
- 
--  if (!err && algorithm == GCRY_MD_MD5 && fips_mode ())
-+  if (!err && !spec->flags.fips && 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 --git a/tests/t-kdf.c b/tests/t-kdf.c
-index 7a48e98a..48309b9a 100644
---- a/tests/t-kdf.c
-+++ b/tests/t-kdf.c
-@@ -1104,6 +1104,13 @@ check_pbkdf2 (void)
-                              GCRY_KDF_PBKDF2, tv[tvidx].hashalgo,
-                              tv[tvidx].salt, tv[tvidx].saltlen,
-                              tv[tvidx].c, tv[tvidx].dklen, outbuf);
-+      if (gcry_fips_mode_active() && tvidx > 6)
-+        {
-+          if (!err)
-+            fail ("pbkdf2 test %d unexpectedly passed in FIPS mode: %s\n",
-+                  tvidx, gpg_strerror (err));
-+          continue;
-+        }
-       if (err)
-         fail ("pbkdf2 test %d failed: %s\n", tvidx, gpg_strerror (err));
-       else if (memcmp (outbuf, tv[tvidx].dk, tv[tvidx].dklen))
-

libgcrypt-1.8.4-fips-keygen.patch

@@ -1,64 +0,0 @@
-diff -up libgcrypt-1.8.4/cipher/dsa.c.fips-keygen libgcrypt-1.8.4/cipher/dsa.c
---- libgcrypt-1.8.4/cipher/dsa.c.fips-keygen	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.4/cipher/dsa.c	2019-02-12 14:29:25.629513989 +0100
-@@ -457,13 +457,22 @@ generate_fips186 (DSA_secret_key *sk, un
-                                              &prime_q, &prime_p,
-                                              r_counter,
-                                              r_seed, r_seedlen);
--      else
-+      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;
-@@ -855,13 +866,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.8.4/cipher/rsa.c.fips-keygen libgcrypt-1.8.4/cipher/rsa.c
---- libgcrypt-1.8.4/cipher/rsa.c.fips-keygen	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.4/cipher/rsa.c	2019-02-12 14:29:25.630513971 +0100
-@@ -389,7 +389,7 @@ generate_fips (RSA_secret_key *sk, unsig
- 
-   if (nbits < 1024 || (nbits & 0x1FF))
-     return GPG_ERR_INV_VALUE;
--  if (_gcry_enforced_fips_mode() && nbits != 2048 && nbits != 3072)
-+  if (fips_mode() && nbits < 2048)
-       return GPG_ERR_INV_VALUE;
- 
-   /* The random quality depends on the transient_key flag.  */
-@@ -696,7 +696,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  */

libgcrypt-1.8.4-use-poll.patch

@@ -1,77 +0,0 @@
-diff -up libgcrypt-1.8.4/random/rndlinux.c.use-poll libgcrypt-1.8.4/random/rndlinux.c
---- libgcrypt-1.8.4/random/rndlinux.c.use-poll	2018-10-26 13:50:20.000000000 +0200
-+++ libgcrypt-1.8.4/random/rndlinux.c	2018-11-20 15:51:56.760669058 +0100
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <poll.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <Availability.h>
- #ifdef __MAC_10_11
-@@ -241,9 +242,8 @@ _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;
- 
-       /* If we have a modern operating system, we first try to use the new
-        * getentropy function.  That call guarantees that the kernel's
-@@ -300,36 +300,25 @@ _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
-+      pfd.fd = fd;
-+      pfd.events = POLLIN;
-+
-+      _gcry_pre_syscall ();
-+      rc = poll(&pfd, 1, delay);
-+      _gcry_post_syscall ();
-+      if (!rc)
-         {
--          FD_ZERO(&rfds);
--          FD_SET(fd, &rfds);
--          tv.tv_sec = delay;
--          tv.tv_usec = delay? 0 : 100000;
--          _gcry_pre_syscall ();
--          rc = select (fd+1, &rfds, NULL, NULL, &tv);
--          _gcry_post_syscall ();
--          if (!rc)
--            {
--              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;
--            }
-+          any_need_entropy = 1;
-+          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.8.5-fips-module.patch

@@ -1,139 +0,0 @@
-diff -up libgcrypt-1.8.5/src/fips.c.fips-module libgcrypt-1.8.5/src/fips.c
---- libgcrypt-1.8.5/src/fips.c.fips-module	2020-04-20 19:07:45.924919645 +0200
-+++ libgcrypt-1.8.5/src/fips.c	2020-04-20 19:10:33.690722470 +0200
-@@ -35,10 +35,6 @@
- #include "hmac256.h"
- 
- 
--/* The name of the file used to force libgcrypt into fips mode. */
--#define FIPS_FORCE_FILE "/etc/gcrypt/fips_enabled"
--
--
- /* The states of the finite state machine used in fips mode.  */
- enum module_states
-   {
-@@ -122,54 +118,6 @@ _gcry_initialize_fips_mode (int force)
-       goto leave;
-     }
- 
--  /* For testing the system it is useful to override the system
--     provided detection of the FIPS mode and force FIPS mode using a
--     file.  The filename is hardwired so that there won't be any
--     confusion on whether /etc/gcrypt/ or /usr/local/etc/gcrypt/ is
--     actually used.  The file itself may be empty.  */
--  if ( !access (FIPS_FORCE_FILE, F_OK) )
--    {
--      gcry_assert (!_gcry_no_fips_mode_required);
--      goto leave;
--    }
--
--  /* Checking based on /proc file properties.  */
--  {
--    static const char procfname[] = "/proc/sys/crypto/fips_enabled";
--    FILE *fp;
--    int saved_errno;
--
--    fp = fopen (procfname, "r");
--    if (fp)
--      {
--        char line[256];
--
--        if (fgets (line, sizeof line, fp) && atoi (line))
--          {
--            /* System is in fips mode.  */
--            fclose (fp);
--            gcry_assert (!_gcry_no_fips_mode_required);
--            goto leave;
--          }
--        fclose (fp);
--      }
--    else if ((saved_errno = errno) != ENOENT
--             && saved_errno != EACCES
--             && !access ("/proc/version", F_OK) )
--      {
--        /* Problem reading the fips file despite that we have the proc
--           file system.  We better stop right away. */
--        log_info ("FATAL: error reading `%s' in libgcrypt: %s\n",
--                  procfname, strerror (saved_errno));
--#ifdef HAVE_SYSLOG
--        syslog (LOG_USER|LOG_ERR, "Libgcrypt error: "
--                "reading `%s' failed: %s - abort",
--                procfname, strerror (saved_errno));
--#endif /*HAVE_SYSLOG*/
--        abort ();
--      }
--  }
--
-   /* Fips not not requested, set flag.  */
-   _gcry_no_fips_mode_required = 1;
- 
-diff -up libgcrypt-1.8.5/src/g10lib.h.fips-module libgcrypt-1.8.5/src/g10lib.h
---- libgcrypt-1.8.5/src/g10lib.h.fips-module	2020-04-20 19:07:45.918919759 +0200
-+++ libgcrypt-1.8.5/src/g10lib.h	2020-04-20 19:11:05.003125740 +0200
-@@ -422,6 +422,9 @@ gpg_err_code_t _gcry_sexp_vextract_param
- 
- /*-- fips.c --*/
- 
-+/* The name of the file used to force libgcrypt into fips mode. */
-+#define FIPS_FORCE_FILE "/etc/gcrypt/fips_enabled"
-+
- extern int _gcry_no_fips_mode_required;
- 
- void _gcry_initialize_fips_mode (int force);
-diff -up libgcrypt-1.8.5/src/global.c.fips-module libgcrypt-1.8.5/src/global.c
---- libgcrypt-1.8.5/src/global.c.fips-module	2020-04-20 19:07:45.919919741 +0200
-+++ libgcrypt-1.8.5/src/global.c	2020-04-20 19:07:45.950919149 +0200
-@@ -160,6 +160,53 @@ void __attribute__ ((constructor)) _gcry
-   rv = access (FIPS_MODULE_PATH, F_OK);
-   if (rv < 0 && errno != ENOENT)
-     rv = 0;
-+ 
-+  /* For testing the system it is useful to override the system
-+     provided detection of the FIPS mode and force FIPS mode using a
-+     file.  The filename is hardwired so that there won't be any
-+     confusion on whether /etc/gcrypt/ or /usr/local/etc/gcrypt/ is
-+     actually used.  The file itself may be empty.  */
-+  if ( !access (FIPS_FORCE_FILE, F_OK) )
-+    {
-+      rv = 0;
-+      force_fips_mode = 1;
-+    }
-+
-+  /* Checking based on /proc file properties.  */
-+  {
-+    static const char procfname[] = "/proc/sys/crypto/fips_enabled";
-+    FILE *fp;
-+    int saved_errno;
-+
-+    fp = fopen (procfname, "r");
-+    if (fp)
-+      {
-+        char line[256];
-+
-+        if (fgets (line, sizeof line, fp) && atoi (line))
-+          {
-+            /* System is in fips mode.  */
-+            rv = 0;
-+            force_fips_mode = 1;
-+          }
-+        fclose (fp);
-+      }
-+    else if ((saved_errno = errno) != ENOENT
-+             && saved_errno != EACCES
-+             && !access ("/proc/version", F_OK) )
-+      {
-+        /* Problem reading the fips file despite that we have the proc
-+           file system.  We better stop right away. */
-+        log_info ("FATAL: error reading `%s' in libgcrypt: %s\n",
-+                  procfname, strerror (saved_errno));
-+#ifdef HAVE_SYSLOG
-+        syslog (LOG_USER|LOG_ERR, "Libgcrypt error: "
-+                "reading `%s' failed: %s - abort",
-+                procfname, strerror (saved_errno));
-+#endif /*HAVE_SYSLOG*/
-+        abort ();
-+      }
-+  }
- 
-   if (!rv)
-     {

libgcrypt-1.8.5-getrandom.patch

@@ -1,277 +0,0 @@
-diff -up libgcrypt-1.8.5/random/rand-internal.h.getrandom libgcrypt-1.8.5/random/rand-internal.h
---- libgcrypt-1.8.5/random/rand-internal.h.getrandom	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.5/random/rand-internal.h	2020-04-20 14:55:34.875949624 +0200
-@@ -47,6 +47,7 @@ void _gcry_random_progress (const char *
- 
- /*-- random-csprng.c --*/
- void _gcry_rngcsprng_initialize (int full);
-+void _gcry_rngcsprng_deinit (void);
- void _gcry_rngcsprng_close_fds (void);
- void _gcry_rngcsprng_dump_stats (void);
- void _gcry_rngcsprng_secure_alloc (void);
-@@ -68,6 +69,7 @@ void _gcry_rngcsprng_fast_poll (void);
- 
- /*-- random-drbg.c --*/
- void _gcry_rngdrbg_inititialize (int full);
-+void _gcry_rngdrbg_deinit (void);
- void _gcry_rngdrbg_close_fds (void);
- void _gcry_rngdrbg_dump_stats (void);
- int  _gcry_rngdrbg_is_faked (void);
-diff -up libgcrypt-1.8.5/random/random.c.getrandom libgcrypt-1.8.5/random/random.c
---- libgcrypt-1.8.5/random/random.c.getrandom	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.5/random/random.c	2020-04-20 14:55:34.876949605 +0200
-@@ -110,8 +110,8 @@ _gcry_random_read_conf (void)
-   unsigned int result = 0;
- 
-   fp = fopen (fname, "r");
--  if (!fp)
--    return result;
-+  if (!fp) /* We make only_urandom the default. */
-+    return RANDOM_CONF_ONLY_URANDOM;
- 
-   for (;;)
-     {
-@@ -228,6 +228,22 @@ _gcry_random_initialize (int full)
- }
- 
- 
-+/* Deinitialize this random subsystem. */
-+void
-+_gcry_random_deinit (void)
-+{
-+  if (fips_mode ())
-+    _gcry_rngdrbg_deinit ();
-+  else if (rng_types.standard)
-+    _gcry_rngcsprng_deinit ();
-+  else if (rng_types.fips)
-+    _gcry_rngdrbg_deinit ();
-+  else
-+    _gcry_rngcsprng_deinit ();
-+  /* not needed for system */
-+}
-+
-+
- /* If possible close file descriptors used by the RNG. */
- void
- _gcry_random_close_fds (void)
-diff -up libgcrypt-1.8.5/random/random-csprng.c.getrandom libgcrypt-1.8.5/random/random-csprng.c
---- libgcrypt-1.8.5/random/random-csprng.c.getrandom	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.5/random/random-csprng.c	2020-04-20 15:04:27.182877975 +0200
-@@ -55,6 +55,10 @@
- #ifdef __MINGW32__
- #include <process.h>
- #endif
-+#if defined(__linux__) && defined(HAVE_SYSCALL)
-+# include <sys/syscall.h>
-+# include <linux/random.h>
-+#endif
- #include "g10lib.h"
- #include "random.h"
- #include "rand-internal.h"
-@@ -343,6 +347,21 @@ _gcry_rngcsprng_initialize (int full)
- }
- 
- 
-+void
-+_gcry_rngcsprng_deinit (void)
-+{
-+  lock_pool();
-+  pool_writepos = 0;
-+  pool_readpos = 0;
-+  pool_filled = 0;
-+  pool_filled_counter = 0;
-+  did_initial_extra_seeding = 0;
-+  pool_balance = 0;
-+  just_mixed = 0;
-+  unlock_pool();
-+}
-+
-+
- /* Try to close the FDs of the random gather module.  This is
-    currently only implemented for rndlinux. */
- void
-@@ -1116,6 +1135,22 @@ getfnc_gather_random (void))(void (*)(co
-              enum random_origins, size_t, int);
- 
- #if USE_RNDLINUX
-+#if defined(__linux__) && defined(HAVE_SYSCALL) && defined(__NR_getrandom)
-+  long ret;
-+  char buffer[1];
-+
-+  _gcry_pre_syscall ();
-+  ret = syscall (__NR_getrandom,
-+                 (void*)buffer, (size_t)1, (unsigned int)GRND_NONBLOCK);
-+  _gcry_post_syscall ();
-+  if (ret != -1 || errno != ENOSYS)
-+    {
-+      fnc = _gcry_rndlinux_gather_random;
-+      return fnc;
-+    }
-+  else
-+          /* The syscall is not supported - fallback to /dev/urandom. */
-+#endif
-   if ( !access (NAME_OF_DEV_RANDOM, R_OK)
-        && !access (NAME_OF_DEV_URANDOM, R_OK))
-     {
-diff -up libgcrypt-1.8.5/random/random-drbg.c.getrandom libgcrypt-1.8.5/random/random-drbg.c
---- libgcrypt-1.8.5/random/random-drbg.c.getrandom	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.5/random/random-drbg.c	2020-04-20 15:02:37.782947902 +0200
-@@ -1811,6 +1811,22 @@ _gcry_rngdrbg_inititialize (int full)
- }
- 
- /*
-+ * Deinitialize the DRBG invoked by the libgcrypt API
-+ * It will be automatically re-initialized on next call
-+ */
-+void
-+_gcry_rngdrbg_deinit (void)
-+{
-+  drbg_lock ();
-+  if (drbg_state)
-+    {
-+      drbg_uninstantiate (drbg_state);
-+      drbg_state = NULL;
-+    }
-+  drbg_unlock ();
-+}
-+
-+/*
-  * Backend handler function for GCRYCTL_DRBG_REINIT
-  *
-  * Select a different DRBG type and initialize it.
-diff -up libgcrypt-1.8.5/random/random.h.getrandom libgcrypt-1.8.5/random/random.h
---- libgcrypt-1.8.5/random/random.h.getrandom	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.5/random/random.h	2020-04-20 14:55:34.877949586 +0200
-@@ -29,6 +29,7 @@ void _gcry_register_random_progress (voi
- 
- void _gcry_set_preferred_rng_type (int type);
- void _gcry_random_initialize (int full);
-+void _gcry_random_deinit (void);
- void _gcry_random_close_fds (void);
- int  _gcry_get_rng_type (int ignore_fips_mode);
- void _gcry_random_dump_stats(void);
-diff -up libgcrypt-1.8.5/random/rndlinux.c.getrandom libgcrypt-1.8.5/random/rndlinux.c
---- libgcrypt-1.8.5/random/rndlinux.c.getrandom	2020-04-20 15:01:50.159848963 +0200
-+++ libgcrypt-1.8.5/random/rndlinux.c	2020-04-20 16:14:21.901610921 +0200
-@@ -35,6 +35,7 @@
- #if defined(__linux__) || !defined(HAVE_GETENTROPY)
- #ifdef HAVE_SYSCALL
- # include <sys/syscall.h>
-+# include <linux/random.h>
- # ifdef __NR_getrandom
- # define getentropy(buf,buflen) syscall (__NR_getrandom, buf, buflen, 0)
- # endif
-@@ -147,12 +148,12 @@ _gcry_rndlinux_gather_random (void (*add
-   if (!add)
-     {
-       /* Special mode to close the descriptors.  */
--      if (fd_random != -1)
-+      if (fd_random >= 0)
-         {
-           close (fd_random);
-           fd_random = -1;
-         }
--      if (fd_urandom != -1)
-+      if (fd_urandom >= 0)
-         {
-           close (fd_urandom);
-           fd_urandom = -1;
-@@ -166,12 +167,12 @@ _gcry_rndlinux_gather_random (void (*add
-   apid = getpid ();
-   if (my_pid != apid)
-     {
--      if (fd_random != -1)
-+      if (fd_random >= 0)
-         {
-           close (fd_random);
-           fd_random = -1;
-         }
--      if (fd_urandom != -1)
-+      if (fd_urandom >= 0)
-         {
-           close (fd_urandom);
-           fd_urandom = -1;
-@@ -216,7 +217,23 @@ _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 >= GCRY_VERY_STRONG_RANDOM && !only_urandom)
-+#if defined(__linux__) && defined(HAVE_SYSCALL) && defined(__NR_getrandom)
-+   if (fd_urandom != -2 && !_gcry_in_constructor ())
-+     {
-+       long ret;
-+
-+       _gcry_pre_syscall ();
-+       ret = syscall (__NR_getrandom,
-+                      (void*)buffer, (size_t)1, (unsigned int)GRND_NONBLOCK);
-+       _gcry_post_syscall ();
-+       if (ret > -1 || errno == EAGAIN || errno == EINTR)
-+         {
-+           fd_urandom = -2;
-+           fd_random = -2;
-+         }
-+     }
-+#endif
-+  if (level >= GCRY_VERY_STRONG_RANDOM && !only_urandom && !_gcry_in_constructor ())
-     {
-       if (fd_random == -1)
-         {
-@@ -270,9 +288,7 @@ _gcry_rndlinux_gather_random (void (*add
-               _gcry_post_syscall ();
-             }
-           while (ret == -1 && errno == EINTR);
--          if (ret == -1 && errno == ENOSYS)
--            ; /* getentropy is not supported - fallback to pulling from fd.  */
--          else
-+          if (1)
-             { /* getentropy is supported.  Some sanity checks.  */
-               if (ret == -1)
-                 log_fatal ("unexpected error from getentropy: %s\n",
-diff -up libgcrypt-1.8.5/src/g10lib.h.getrandom libgcrypt-1.8.5/src/g10lib.h
---- libgcrypt-1.8.5/src/g10lib.h.getrandom	2020-04-20 15:08:16.528538580 +0200
-+++ libgcrypt-1.8.5/src/g10lib.h	2020-04-20 15:08:28.641309399 +0200
-@@ -464,6 +464,6 @@ gpg_err_code_t _gcry_fips_run_selftests
- void _gcry_fips_noreturn (void);
- #define fips_noreturn()  (_gcry_fips_noreturn ())
- 
--
-+int _gcry_in_constructor (void);
- 
- #endif /* G10LIB_H */
-diff -up libgcrypt-1.8.5/src/global.c.getrandom libgcrypt-1.8.5/src/global.c
---- libgcrypt-1.8.5/src/global.c.getrandom	2020-04-20 15:06:21.891707597 +0200
-+++ libgcrypt-1.8.5/src/global.c	2020-04-20 15:07:29.018437509 +0200
-@@ -145,10 +145,18 @@ global_init (void)
- #define FIPS_MODULE_PATH "/etc/system-fips"
- #endif
- 
-+static int in_constructor = 0;
-+
-+int _gcry_in_constructor(void)
-+{
-+  return in_constructor;
-+}
-+
- void __attribute__ ((constructor)) _gcry_global_constructor (void)
- {
-   int rv;
- 
-+  in_constructor = 1;
-   rv = access (FIPS_MODULE_PATH, F_OK);
-   if (rv < 0 && errno != ENOENT)
-     rv = 0;
-@@ -163,10 +171,12 @@ void __attribute__ ((constructor)) _gcry
-       /* force selftests */
-       global_init();
-       _gcry_fips_run_selftests (0);
--      if (!fips_mode())
--         _gcry_random_close_fds ();
-+      _gcry_random_close_fds ();
-+      _gcry_random_deinit ();
-       no_secure_memory = no_secmem_save;
-     }
-+
-+  in_constructor = 0;
- }
- 
- /* This function is called by the macro fips_is_operational and makes

libgcrypt-1.8.5-intel-cet.patch

@@ -1,34 +0,0 @@
-From b04c0a86b19856071c29d2a6285f3240c606ee7a Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Tue, 27 Apr 2021 09:08:41 -0700
-Subject: [PATCH] Always include <config.h> in cipher assembly codes
-
-* cipher/poly1305-s390x.S: Always include <config.h>.
-
-When Intel CET is enabled, we need to include <cet.h> in assembly codes
-to mark Intel CET support even if it is empty.  We should always include
-<config.h> in cipher assembly codes so that they will be marked for
-Intel CET support when compiling for x86-64 and i686.
-
-Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
----
- cipher/poly1305-s390x.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cipher/poly1305-s390x.S b/cipher/poly1305-s390x.S
-index 844245f6..28bed560 100644
---- a/cipher/poly1305-s390x.S
-+++ b/cipher/poly1305-s390x.S
-@@ -18,8 +18,8 @@
-  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#if defined (__s390x__) && __GNUC__ >= 4 && __ARCH__ >= 9
- #include <config.h>
-+#if defined (__s390x__) && __GNUC__ >= 4 && __ARCH__ >= 9
- #if defined(HAVE_GCC_INLINE_ASM_S390X)
- 
- #include "asm-poly1305-s390x.h"
--- 
-GitLab
-

libgcrypt-1.8.5-use-fipscheck.patch

@@ -1,77 +0,0 @@
-diff -up libgcrypt-1.8.5/src/fips.c.use-fipscheck libgcrypt-1.8.5/src/fips.c
---- libgcrypt-1.8.5/src/fips.c.use-fipscheck	2017-11-23 19:16:58.000000000 +0100
-+++ libgcrypt-1.8.5/src/fips.c	2020-04-23 10:18:36.235764741 +0200
-@@ -581,23 +581,50 @@ run_random_selftests (void)
-   return !!err;
- }
- 
-+#ifdef ENABLE_HMAC_BINARY_CHECK
-+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;
-+}
-+#endif
-+
- /* 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 ();
-@@ -605,7 +632,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
-@@ -614,7 +641,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++;

libgcrypt.spec

@@ -1,59 +1,35 @@
+# 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.9.4
+Version: 1.11.2
 Release: 1%{?dist}
 URL: https://www.gnupg.org/
-Source0: libgcrypt-%{version}-hobbled.tar.xz
+Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
-# The original libgcrypt sources now contain potentially patented ECC
+Source1: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
-# cipher support. We have to remove it in the tarball we ship with
+Source2: https://gnupg.org/signature_key.asc
-# the hobble-libgcrypt script. 
+# Pass the annobin flags to the libgcrypt.so (#2016349)
-# (We replace it with RH approved ECC in Source4-5)
+Patch1: libgcrypt-1.10.1-annobin.patch
-# rm -rf libgcrypt-x.y.z # make sure there are no leftover files
+# https://gitlab.com/redhat-crypto/libgcrypt/libgcrypt-mirror/-/merge_requests/19/
-# tar -xf libgcrypt-x.y.z.tar.bz2
+Patch5: libgcrypt-1.11.0-marvin.patch
-# pushd libgcrypt-x.y.z && ../hobble-libgcrypt && popd
-# tar -cvJf libgcrypt-x.y.z-hobbled.tar.xz libgcrypt-x.y.z
-#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: wk@g10code.com
-Source3: hobble-libgcrypt
-# Approved ECC support
-Source4: ecc-curves.c
-Source5: curves.c
-Source7: random.conf
-Source8: keygrip.c
-# make FIPS hmac compatible with fipscheck - non upstreamable
-# update on soname bump
-Patch2: libgcrypt-1.8.5-use-fipscheck.patch
-# modify FIPS RSA and DSA keygen to comply with requirements
-Patch5: libgcrypt-1.8.4-fips-keygen.patch
-# fix the tests to work correctly in the FIPS mode
-Patch6: libgcrypt-1.9.3-fips-tests.patch
-# update the CAVS tests
-Patch7: libgcrypt-1.7.3-fips-cavs.patch
-# use poll instead of select when gathering randomness
-Patch11: libgcrypt-1.8.4-use-poll.patch
-# slight optimalization of mpicoder.c to silence Valgrind (#968288)
-Patch13: libgcrypt-1.6.1-mpicoder-gccopt.patch
-# Run the FIPS mode initialization in the shared library constructor
-Patch18: libgcrypt-1.8.3-fips-ctor.patch
-# Do not try to open /dev/urandom if getrandom() works
-Patch24: libgcrypt-1.8.5-getrandom.patch
-# Continuous FIPS entropy test
-Patch26: libgcrypt-1.8.3-fips-enttest.patch
-# Disable non-approved FIPS hashes in the enforced FIPS mode
-Patch27: libgcrypt-1.8.3-md-fips-enforce.patch
-# Missing Intel CET support in the library (#1954049)
-Patch28: libgcrypt-1.8.5-intel-cet.patch
-# FIPS module is redefined a little bit (implicit by kernel FIPS mode)
-Patch30: libgcrypt-1.8.5-fips-module.patch
 
 %global gcrylibdir %{_libdir}
 %global gcrysoname libgcrypt.so.20
 %global hmackey orboDeJITITejsirpADONivirpUkvarP
 
-# Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
+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
-# Documentation and some utilities are GPLv2+ licensed. These files
-# are in the devel subpackage.
-License: LGPLv2+
 Summary: A general-purpose cryptography library
 BuildRequires: gcc
 BuildRequires: gawk, libgpg-error-devel >= 1.11, pkgconfig
@@ -61,10 +37,11 @@ BuildRequires: gawk, libgpg-error-devel >= 1.11, pkgconfig
 BuildRequires: texinfo
 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+
 Requires: libgpg-error-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
@@ -79,33 +56,18 @@ 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}
+%patch 1 -p1
-%patch2 -p1 -b .use-fipscheck
+%patch 5 -p1
-%patch5 -p1 -b .fips-keygen
-%patch6 -p1 -b .tests-fipsmode
-%patch7 -p1 -b .cavs
-%patch11 -p1 -b .use-poll
-%patch13 -p1 -b .gccopt
-%patch18 -p1 -b .fips-ctor
-%patch24 -p1 -b .getrandom
-%patch26 -p1 -b .fips-enttest
-%patch27 -p1 -b .fips-enforce
-%patch28 -p1 -b .intel-cet
-%patch30 -p1 -b .fips-module
-
-cp %{SOURCE4} cipher/
-cp %{SOURCE5} %{SOURCE8} tests/
 
 %build
-# This package has a configure test which uses ASMs, but does not link the
+# should be all algorithms except SM3 and SM4, aria
-# resultant .o files.  As such the ASM test is always successful, even on
+export DIGESTS='crc gostr3411-94 md4 md5 rmd160 sha1 sha256 sha512 sha3 tiger whirlpool stribog blake2'
-# architectures were the ASM is not valid when compiling with LTO.
+export CIPHERS='arcfour blowfish cast5 des aes twofish serpent rfc2268 seed camellia idea salsa20 gost28147 chacha20'
-#
+
-# -ffat-lto-objects is sufficient to address this issue.  It is the default
+eval $(sed -n 's/^\(\(NAME\|VERSION_ID\)=.*\)/OS_\1/p' /etc/os-release)
-# for F33, but is expected to only be enabled for packages that need it in
+export FIPS_MODULE_NAME="$OS_NAME ${OS_VERSION_ID%%.*} %name"
-# F34, so we use it here explicitly
-%define _lto_cflags -flto=auto -ffat-lto-objects
 
 autoreconf -f
 %configure --disable-static \
@@ -113,23 +75,36 @@ autoreconf -f
      --disable-asm \
 %endif
      --enable-noexecstack \
-     --enable-hmac-binary-check \
+     --enable-hmac-binary-check=%{hmackey} \
-     --enable-pubkey-ciphers='dsa elgamal rsa ecc' \
+     --disable-jent-support \
-     --disable-O-flag-munging
+     --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_build
 
 %check
-src/hmac256 %{hmackey} src/.libs/%{gcrysoname} | cut -f1 -d ' ' >src/.libs/.%{gcrysoname}.hmac
-
 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} \
-    src/hmac256 %{hmackey} $RPM_BUILD_ROOT%{gcrylibdir}/%{gcrysoname} | cut -f1 -d ' ' >$RPM_BUILD_ROOT%{gcrylibdir}/.%{gcrysoname}.hmac \
+    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
@@ -174,16 +149,13 @@ popd
 # Create /etc/gcrypt (hardwired, not dependent on the configure invocation) so
 # that _someone_ owns it.
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/gcrypt
-install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf
 
 %ldconfig_scriptlets
 
 %files
 %dir /etc/gcrypt
-%config(noreplace) /etc/gcrypt/random.conf
 %{gcrylibdir}/libgcrypt.so.*.*
 %{gcrylibdir}/%{gcrysoname}
-%{gcrylibdir}/.%{gcrysoname}.hmac
 %license COPYING.LIB
 %doc AUTHORS NEWS THANKS
 
@@ -202,6 +174,80 @@ install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf
 %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)
 

random.conf

@@ -1,4 +0,0 @@
-# use only /dev/urandom - see https://www.2uo.de/myths-about-urandom/
-only-urandom
-# Keep jitter entropy generator enabled (should do no harm)
-#disable-jent

signature_key.asc

@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+eiInsGZ/+h5XYrpXTgA=
+=4+Sn
+-----END PGP PUBLIC KEY BLOCK-----

sources

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

tests/smoke-test/Makefile

@@ -57,10 +57,14 @@ $(METADATA): Makefile
 	@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++ fipscheck" >> $(METADATA)
+	@echo "Requires:        gcc-c++" >> $(METADATA)
-	@echo "Requires:        libgpg-error-devel wget" >> $(METADATA)
+	@echo "Requires:        libgpg-error-devel" >> $(METADATA)
-	@echo "Requires:        pkgconfig texinfo libselinux-utils" >> $(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)

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

@@ -26,8 +26,6 @@
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-# Include rhts environment
-#. /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 
 PACKAGE="libgcrypt"
@@ -35,36 +33,112 @@ PACKAGE="libgcrypt"
 rlJournalStart
 
     rlPhaseStartSetup
+        rlImport distribution/fips || rlFail "FIPS library needed for some phases"
         TmpDir=`mktemp -d`
         rlAssertRpm $PACKAGE
-        rlFileBackup --clean "/etc/gcrypt/fips_enabled"
+        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
-        rlFetchSrcForInstalled $PACKAGE
+        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
+    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
-        rlRun "pushd BUILD/libgcrypt-*" 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 "make check > $TmpDir/make_check.out" 0
+        rlRun "popd"
-        rlRun "popd" 0
+        rlRun "popd"
-        rlRun "popd" 0
-        rlRun "grep \"All [0-9]\+ tests passed\" $TmpDir/make_check.out" 0 \
-            "All tests passed"
-        rlRun "cat $TmpDir/make_check.out" 0
     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" 0
+        rlRun "popd"
         rlRun "rm -r $TmpDir" 0
-        rlFileRestore
+        rlRun "rlFileRestore"
     rlPhaseEnd
 
 rlJournalPrintText

tests/tests.yml

@@ -1,20 +0,0 @@
-- hosts: localhost
-  tags:
-  - classic
-  - container
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - smoke-test
-    required_packages:
-    - fipscheck
-    - gawk
-    - gcc-c++
-    - libgcrypt
-    - libgpg-error-devel
-    - libselinux-utils
-    - nfs-utils
-    - pkgconfig
-    - rpm-build
-    - texinfo
-    - wget