forked from pool/libgcrypt
* Bug fixes: - Fix Kyber secret-dependent branch introduced by recent versions of Clang. [rCf765778e82] - Fix build regression due to the use of AVX512 in Blake. [T7184] - Do not build i386 asm on amd64 and vice versa. [T7220] - Fix build regression on armhf with gcc-14. [T7226] - Return the proper error code on malloc failure in hex2buffer. [rCc51151f5b0] - Fix long standing bug for PRIME % 2 == 0. [rC639b0fca15] * Performance: - Add AES Vector Permute intrinsics implementation for AArch64. [rC94a63aedbb] - Add GHASH AArch64/SIMD intrinsics implementation. [rCfec871fd18] - Add RISC-V vector permute AES. [rCb24ebd6163] - Add GHASH RISC-V Zbb+Zbc implementation. [rC0f1fec12b0] - Add ChaCha20 RISC-V vector intrinsics implementation. [rC8dbee93ac2] - Add SHA3 acceleration for RISC-V Zbb extension. [rC1a660068ba] * Other: - Add CET support for i386 and amd64 assembly. [T7220] - Add PAC/BTI support for AArch64 asm. [T7220] - Apply changes to Kyber from upstream for final FIPS 203. [rCcc95c36e7f] - Introduce an internal API for a revampled FIPS service indicator. [T7340] - Several improvements for constant time operation by the introduction of Least Leak Intended (LLI) variants of internal functions. [T7519,T7490] * Rebase patches: - libgcrypt-FIPS-SLI-hash-mac.patch - libgcrypt-FIPS-SLI-pk.patch - libgcrypt-FIPS-jitter-standalone.patch * Remove patches: - libgcrypt-fips-Introduce-an-internal-API-for-FIPS-service-indicator.patch - libgcrypt-fips-Introduce-GCRYCTL_FIPS_SERVICE_INDICATOR-and-the-macro.patch - libgcrypt-fips-kdf-Implement-new-FIPS-service-indicator-for-gcry_kdf_derive.patch - libgcrypt-fips-md-Implement-new-FIPS-service-indicator-for-gcry_md_hash_.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=190
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
Index: libgcrypt-1.11.1/src/gcrypt.h.in
|
|
===================================================================
|
|
--- libgcrypt-1.11.1.orig/src/gcrypt.h.in
|
|
+++ libgcrypt-1.11.1/src/gcrypt.h.in
|
|
@@ -335,12 +335,9 @@ enum gcry_ctl_cmds
|
|
GCRYCTL_FIPS_SERVICE_INDICATOR_MAC = 85,
|
|
GCRYCTL_FIPS_SERVICE_INDICATOR_MD = 86,
|
|
GCRYCTL_FIPS_SERVICE_INDICATOR_PK_FLAGS = 87,
|
|
- GCRYCTL_MD_CUSTOMIZE = 88
|
|
-#ifdef _GCRYPT_IN_LIBGCRYPT /* This is not yet part of the public API. */
|
|
- ,
|
|
+ GCRYCTL_MD_CUSTOMIZE = 88,
|
|
GCRYCTL_FIPS_SERVICE_INDICATOR = 89,
|
|
GCRYCTL_FIPS_REJECT_NON_FIPS = 90
|
|
-#endif /*_GCRYPT_IN_LIBGCRYPT*/
|
|
};
|
|
|
|
/* Perform various operations defined by CMD. */
|
|
@@ -1977,8 +1974,6 @@ void gcry_log_debugsxp (const char *text
|
|
char *gcry_get_config (int mode, const char *what);
|
|
|
|
/* Convinience macro to access the FIPS service indicator. */
|
|
-#ifdef _GCRYPT_IN_LIBGCRYPT /* This is not yet part of the public API. */
|
|
-
|
|
#define gcry_get_fips_service_indicator() \
|
|
gcry_control (GCRYCTL_FIPS_SERVICE_INDICATOR)
|
|
|
|
@@ -2012,9 +2007,6 @@ char *gcry_get_config (int mode, const c
|
|
#define GCRY_FIPS_FLAG_REJECT_DEFAULT \
|
|
GCRY_FIPS_FLAG_REJECT_COMPAT110
|
|
|
|
-#endif /*_GCRYPT_IN_LIBGCRYPT*/
|
|
-
|
|
-
|
|
/* Log levels used by the internal logging facility. */
|
|
enum gcry_log_levels
|
|
{
|