forked from pool/libgcrypt
Pedro Monreal Gonzalez
dea0435690
- Update to 1.9.1
* *Fix exploitable bug* in hash functions introduced with
1.9.0. [bsc#1181632, CVE-2021-3345]
* Return an error if a negative MPI is used with sexp scan
functions.
* Check for operational FIPS in the random and KDF functions.
* Fix compile error on ARMv7 with NEON disabled.
* Fix self-test in KDF module.
* Improve assembler checks for better LTO support.
* Fix 32-bit cross build on x86.
* Fix non-NEON ARM assembly implementation for SHA512.
* Fix build problems with the cipher_bulk_ops_t typedef.
* Fix Ed25519 private key handling for preceding ZEROs.
* Fix overflow in modular inverse implementation.
* Fix register access for AVX/AVX2 implementations of Blake2.
* Add optimized cipher and hash functions for s390x/zSeries.
* Use hardware bit counting functionx when available.
* Update DSA functions to match FIPS 186-3.
* New self-tests for CMACs and KDFs.
* Add bulk cipher functions for OFB and GCM modes.
- Update libgpg-error required version
- Use the suffix variable correctly in get_hmac_path()
- Rebase libgcrypt-fips_selftest_trigger_file.patch
- Add the global config file /etc/gcrypt/random.conf
* This file can be used to globally change parameters of the random
generator with the options: only-urandom and disable-jent.
- Update to 1.9.0:
OBS-URL: https://build.opensuse.org/request/show/868925
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=142
246 lines
7.1 KiB
Diff
246 lines
7.1 KiB
Diff
Index: libgcrypt-1.9.0/cipher/pubkey.c
|
|
===================================================================
|
|
--- libgcrypt-1.9.0.orig/cipher/pubkey.c
|
|
+++ libgcrypt-1.9.0/cipher/pubkey.c
|
|
@@ -384,6 +384,33 @@ _gcry_pk_decrypt (gcry_sexp_t *r_plain,
|
|
}
|
|
|
|
|
|
+static gcry_err_code_t
|
|
+calculate_hash (gcry_md_hd_t hd, gcry_sexp_t* s_hash)
|
|
+{
|
|
+ gcry_err_code_t rc;
|
|
+ const unsigned char *digest;
|
|
+ int algo;
|
|
+
|
|
+ if (!hd)
|
|
+ return 0;
|
|
+
|
|
+ rc = _gcry_pk_util_get_algo (*s_hash, &algo);
|
|
+ if (rc)
|
|
+ return rc;
|
|
+
|
|
+ digest = _gcry_md_read(hd, algo);
|
|
+ if (!digest)
|
|
+ return GPG_ERR_DIGEST_ALGO;
|
|
+
|
|
+ rc = _gcry_sexp_build (s_hash, NULL,
|
|
+ "(data (flags pkcs1)(hash %s %b))",
|
|
+ _gcry_md_algo_name(algo),
|
|
+ (int) _gcry_md_get_algo_dlen(algo),
|
|
+ digest);
|
|
+
|
|
+ return rc;
|
|
+}
|
|
+
|
|
|
|
/*
|
|
Create a signature.
|
|
@@ -414,7 +441,8 @@ _gcry_pk_decrypt (gcry_sexp_t *r_plain,
|
|
Note that (hash algo) in R_SIG is not used.
|
|
*/
|
|
gcry_err_code_t
|
|
-_gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_hash, gcry_sexp_t s_skey)
|
|
+_gcry_pk_sign_md (gcry_sexp_t *r_sig, gcry_md_hd_t hd, gcry_sexp_t s_hash,
|
|
+ gcry_sexp_t s_skey)
|
|
{
|
|
gcry_err_code_t rc;
|
|
gcry_pk_spec_t *spec;
|
|
@@ -426,6 +454,10 @@ _gcry_pk_sign (gcry_sexp_t *r_sig, gcry_
|
|
if (rc)
|
|
goto leave;
|
|
|
|
+ rc = calculate_hash (hd, &s_hash);
|
|
+ if (rc)
|
|
+ goto leave;
|
|
+
|
|
if (spec->sign)
|
|
rc = spec->sign (r_sig, s_hash, keyparms);
|
|
else
|
|
@@ -437,6 +469,13 @@ _gcry_pk_sign (gcry_sexp_t *r_sig, gcry_
|
|
}
|
|
|
|
|
|
+gcry_err_code_t
|
|
+_gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_hash, gcry_sexp_t s_skey)
|
|
+{
|
|
+ return _gcry_pk_sign_md (r_sig, NULL, s_hash, s_skey);
|
|
+}
|
|
+
|
|
+
|
|
/*
|
|
Verify a signature.
|
|
|
|
@@ -445,7 +484,8 @@ _gcry_pk_sign (gcry_sexp_t *r_sig, gcry_
|
|
as an S-Exp, sig is a S-Exp as returned from gcry_pk_sign and data
|
|
must be an S-Exp like the one in sign too. */
|
|
gcry_err_code_t
|
|
-_gcry_pk_verify (gcry_sexp_t s_sig, gcry_sexp_t s_hash, gcry_sexp_t s_pkey)
|
|
+_gcry_pk_verify_md (gcry_sexp_t s_sig, gcry_md_hd_t hd, gcry_sexp_t s_hash,
|
|
+ gcry_sexp_t s_pkey)
|
|
{
|
|
gcry_err_code_t rc;
|
|
gcry_pk_spec_t *spec;
|
|
@@ -455,6 +495,10 @@ _gcry_pk_verify (gcry_sexp_t s_sig, gcry
|
|
if (rc)
|
|
goto leave;
|
|
|
|
+ rc = calculate_hash (hd, &s_hash);
|
|
+ if (rc)
|
|
+ goto leave;
|
|
+
|
|
if (spec->verify)
|
|
rc = spec->verify (s_sig, s_hash, keyparms);
|
|
else
|
|
@@ -466,6 +510,13 @@ _gcry_pk_verify (gcry_sexp_t s_sig, gcry
|
|
}
|
|
|
|
|
|
+gcry_err_code_t
|
|
+_gcry_pk_verify (gcry_sexp_t s_sig, gcry_sexp_t s_hash, gcry_sexp_t s_pkey)
|
|
+{
|
|
+ return _gcry_pk_verify_md (s_sig, NULL, s_hash, s_pkey);
|
|
+}
|
|
+
|
|
+
|
|
/*
|
|
Test a key.
|
|
|
|
Index: libgcrypt-1.9.0/cipher/pubkey-internal.h
|
|
===================================================================
|
|
--- libgcrypt-1.9.0.orig/cipher/pubkey-internal.h
|
|
+++ libgcrypt-1.9.0/cipher/pubkey-internal.h
|
|
@@ -43,6 +43,8 @@ void _gcry_pk_util_free_encoding_ctx (st
|
|
gcry_err_code_t _gcry_pk_util_data_to_mpi (gcry_sexp_t input,
|
|
gcry_mpi_t *ret_mpi,
|
|
struct pk_encoding_ctx *ctx);
|
|
+gcry_err_code_t _gcry_pk_util_get_algo (gcry_sexp_t input,
|
|
+ int *algo);
|
|
|
|
|
|
|
|
Index: libgcrypt-1.9.0/cipher/pubkey-util.c
|
|
===================================================================
|
|
--- libgcrypt-1.9.0.orig/cipher/pubkey-util.c
|
|
+++ libgcrypt-1.9.0/cipher/pubkey-util.c
|
|
@@ -1158,3 +1158,50 @@ _gcry_pk_util_data_to_mpi (gcry_sexp_t i
|
|
|
|
return rc;
|
|
}
|
|
+
|
|
+
|
|
+gcry_err_code_t
|
|
+_gcry_pk_util_get_algo (gcry_sexp_t input, int *algo)
|
|
+{
|
|
+ gcry_err_code_t rc = 0;
|
|
+ gcry_sexp_t ldata, list = NULL;
|
|
+ const char *s;
|
|
+ size_t n;
|
|
+ int lalgo;
|
|
+
|
|
+ ldata = sexp_find_token (input, "data", 0);
|
|
+ if (!ldata)
|
|
+ {
|
|
+ rc = GPG_ERR_INV_OBJ;
|
|
+ goto leave;
|
|
+ }
|
|
+
|
|
+ list = sexp_find_token (ldata, "hash-algo", 0);
|
|
+ if (!list)
|
|
+ {
|
|
+ rc = GPG_ERR_INV_OBJ;
|
|
+ goto leave;
|
|
+ }
|
|
+
|
|
+ s = sexp_nth_data (list, 1, &n);
|
|
+ if (!s)
|
|
+ {
|
|
+ rc = GPG_ERR_NO_OBJ;
|
|
+ goto leave;
|
|
+ }
|
|
+
|
|
+ lalgo = get_hash_algo (s, n);
|
|
+ if (!lalgo)
|
|
+ {
|
|
+ rc = GPG_ERR_DIGEST_ALGO;
|
|
+ goto leave;
|
|
+ }
|
|
+
|
|
+ *algo = lalgo;
|
|
+
|
|
+ leave:
|
|
+ sexp_release (ldata);
|
|
+ sexp_release (list);
|
|
+
|
|
+ return rc;
|
|
+}
|
|
Index: libgcrypt-1.9.0/src/g10lib.h
|
|
===================================================================
|
|
--- libgcrypt-1.9.0.orig/src/g10lib.h
|
|
+++ libgcrypt-1.9.0/src/g10lib.h
|
|
@@ -299,6 +299,10 @@ gpg_err_code_t _gcry_generate_fips186_3_
|
|
gpg_err_code_t _gcry_fips186_4_prime_check (const gcry_mpi_t x,
|
|
unsigned int bits);
|
|
|
|
+gcry_err_code_t _gcry_pk_sign_md (gcry_sexp_t *r_sig, gcry_md_hd_t hd,
|
|
+ gcry_sexp_t s_hash, gcry_sexp_t s_skey);
|
|
+gcry_err_code_t _gcry_pk_verify_md (gcry_sexp_t s_sig, gcry_md_hd_t hd,
|
|
+ gcry_sexp_t s_hash, gcry_sexp_t s_pkey);
|
|
|
|
/* Replacements of missing functions (missing-string.c). */
|
|
#ifndef HAVE_STPCPY
|
|
Index: libgcrypt-1.9.0/src/visibility.c
|
|
===================================================================
|
|
--- libgcrypt-1.9.0.orig/src/visibility.c
|
|
+++ libgcrypt-1.9.0/src/visibility.c
|
|
@@ -992,6 +992,18 @@ gcry_pk_decrypt (gcry_sexp_t *result, gc
|
|
}
|
|
|
|
gcry_error_t
|
|
+gcry_pk_sign_md (gcry_sexp_t *result, gcry_md_hd_t hd, gcry_sexp_t data,
|
|
+ gcry_sexp_t skey)
|
|
+{
|
|
+ if (!fips_is_operational ())
|
|
+ {
|
|
+ *result = NULL;
|
|
+ return gpg_error (fips_not_operational ());
|
|
+ }
|
|
+ return gpg_error (_gcry_pk_sign_md (result, hd, data, skey));
|
|
+}
|
|
+
|
|
+gcry_error_t
|
|
gcry_pk_sign (gcry_sexp_t *result, gcry_sexp_t data, gcry_sexp_t skey)
|
|
{
|
|
if (!fips_is_operational ())
|
|
@@ -1003,6 +1015,15 @@ gcry_pk_sign (gcry_sexp_t *result, gcry_
|
|
}
|
|
|
|
gcry_error_t
|
|
+gcry_pk_verify_md (gcry_sexp_t sigval, gcry_md_hd_t hd, gcry_sexp_t data,
|
|
+ gcry_sexp_t pkey)
|
|
+{
|
|
+ if (!fips_is_operational ())
|
|
+ return gpg_error (fips_not_operational ());
|
|
+ return gpg_error (_gcry_pk_verify_md (sigval, hd, data, pkey));
|
|
+}
|
|
+
|
|
+gcry_error_t
|
|
gcry_pk_verify (gcry_sexp_t sigval, gcry_sexp_t data, gcry_sexp_t pkey)
|
|
{
|
|
if (!fips_is_operational ())
|
|
Index: libgcrypt-1.9.0/src/visibility.h
|
|
===================================================================
|
|
--- libgcrypt-1.9.0.orig/src/visibility.h
|
|
+++ libgcrypt-1.9.0/src/visibility.h
|
|
@@ -360,8 +360,10 @@ MARK_VISIBLEX (_gcry_mpi_get_const)
|
|
#define gcry_pk_get_param _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_pk_get_nbits _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_pk_map_name _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
+#define gcry_pk_sign_md _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_pk_sign _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_pk_testkey _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
+#define gcry_pk_verify_md _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_pk_verify _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_pubkey_get_sexp _gcry_USE_THE_UNDERSCORED_FUNCTION
|
|
#define gcry_ecc_get_algo_keylen _gcry_USE_THE_UNDERSCORED_FUNCTION
|