forked from pool/libgcrypt
9a7cde5372
- FIPS: libgcrypt: Double free in test_keys() on failed signature
verification [bsc#1169944]
* Use safer gcry_mpi_release() instead of mpi_free()
- Update patches:
* libgcrypt-PCT-DSA.patch
* libgcrypt-PCT-RSA.patch
* libgcrypt-PCT-ECC.patch
- Ship the FIPS checksum file in the shared library package and
create a separate trigger file for the FIPS selftests (bsc#1169569)
* add libgcrypt-fips_selftest_trigger_file.patch
* refresh libgcrypt-global_init-constructor.patch
- Remove libgcrypt-binary_integrity_in_non-FIPS.patch obsoleted
by libgcrypt-global_init-constructor.patch
- FIPS: Verify that the generated signature and the original input
differ in test_keys function for RSA, DSA and ECC: [bsc#1165539]
- Add zero-padding when qx and qy have different lengths when
assembling the Q point from affine coordinates.
- Refreshed patches:
* libgcrypt-PCT-DSA.patch
* libgcrypt-PCT-RSA.patch
* libgcrypt-PCT-ECC.patch
- FIPS: Switch the PCT to use the new signature operation [bsc#1165539]
* Patches for DSA, RSA and ECDSA test_keys functions:
- libgcrypt-PCT-DSA.patch
- libgcrypt-PCT-RSA.patch
- libgcrypt-PCT-ECC.patch
- Update patch: libgcrypt-FIPS-RSA-DSA-ECDSA-hashing-operation.patch
OBS-URL: https://build.opensuse.org/request/show/805624
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=134
85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
Index: libgcrypt-1.8.5/cipher/ecc.c
|
|
===================================================================
|
|
--- libgcrypt-1.8.5.orig/cipher/ecc.c
|
|
+++ libgcrypt-1.8.5/cipher/ecc.c
|
|
@@ -2060,11 +2060,11 @@ selftest_sign (gcry_sexp_t pkey, gcry_se
|
|
{
|
|
/* Sample data from RFC 6979 section A.2.5, hash is of message "sample" */
|
|
static const char sample_data[] =
|
|
- "(data (flags rfc6979)"
|
|
+ "(data (flags rfc6979 no-blinding)"
|
|
" (hash sha256 #af2bdbe1aa9b6ec1e2ade1d694f41fc71a831d0268e98915"
|
|
/**/ "62113d8a62add1bf#))";
|
|
static const char sample_data_bad[] =
|
|
- "(data (flags rfc6979)"
|
|
+ "(data (flags rfc6979 no-blinding)"
|
|
" (hash sha256 #bf2bdbe1aa9b6ec1e2ade1d694f41fc71a831d0268e98915"
|
|
/**/ "62113d8a62add1bf#))";
|
|
static const char signature_r[] =
|
|
Index: libgcrypt-1.8.5/cipher/ecc-ecdsa.c
|
|
===================================================================
|
|
--- libgcrypt-1.8.5.orig/cipher/ecc-ecdsa.c
|
|
+++ libgcrypt-1.8.5/cipher/ecc-ecdsa.c
|
|
@@ -52,6 +52,7 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input,
|
|
mpi_ec_t ctx;
|
|
gcry_mpi_t b; /* Random number needed for blinding. */
|
|
gcry_mpi_t bi; /* multiplicative inverse of B. */
|
|
+ int with_blinding = !(flags & PUBKEY_FLAG_NO_BLINDING);
|
|
|
|
if (DBG_CIPHER)
|
|
log_mpidump ("ecdsa sign hash ", input );
|
|
@@ -65,12 +66,15 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input,
|
|
|
|
b = mpi_snew (qbits);
|
|
bi = mpi_snew (qbits);
|
|
- do
|
|
+ if (with_blinding)
|
|
{
|
|
- _gcry_mpi_randomize (b, qbits, GCRY_WEAK_RANDOM);
|
|
- mpi_mod (b, b, skey->E.n);
|
|
+ do
|
|
+ {
|
|
+ _gcry_mpi_randomize (b, qbits, GCRY_WEAK_RANDOM);
|
|
+ mpi_mod (b, b, skey->E.n);
|
|
+ }
|
|
+ while (!mpi_invm (bi, b, skey->E.n));
|
|
}
|
|
- while (!mpi_invm (bi, b, skey->E.n));
|
|
|
|
k = NULL;
|
|
dr = mpi_alloc (0);
|
|
@@ -128,15 +132,26 @@ _gcry_ecc_ecdsa_sign (gcry_mpi_t input,
|
|
}
|
|
while (!mpi_cmp_ui (r, 0));
|
|
|
|
- /* Computation of dr, sum, and s are blinded with b. */
|
|
- mpi_mulm (dr, b, skey->d, skey->E.n);
|
|
- mpi_mulm (dr, dr, r, skey->E.n); /* dr = d*r mod n */
|
|
- mpi_mulm (sum, b, hash, skey->E.n);
|
|
- mpi_addm (sum, sum, dr, skey->E.n); /* sum = hash + (d*r) mod n */
|
|
+ if (!with_blinding)
|
|
+ {
|
|
+ mpi_mulm (dr, skey->d, r, skey->E.n); /* dr = d*r mod n */
|
|
+ mpi_addm (sum, hash, dr, skey->E.n); /* sum = hash + (d*r) mod n */
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ /* Computation of dr, sum, and s are blinded with b. */
|
|
+ mpi_mulm (dr, b, skey->d, skey->E.n);
|
|
+ mpi_mulm (dr, dr, r, skey->E.n); /* dr = d*r mod n */
|
|
+ mpi_mulm (sum, b, hash, skey->E.n);
|
|
+ mpi_addm (sum, sum, dr, skey->E.n); /* sum = hash + (d*r) mod n */
|
|
+ }
|
|
mpi_invm (k_1, k, skey->E.n); /* k_1 = k^(-1) mod n */
|
|
mpi_mulm (s, k_1, sum, skey->E.n); /* s = k^(-1)*(hash+(d*r)) mod n */
|
|
- /* Undo blinding by b^-1 */
|
|
- mpi_mulm (s, bi, s, skey->E.n);
|
|
+ if (with_blinding)
|
|
+ {
|
|
+ /* Undo blinding by b^-1 */
|
|
+ mpi_mulm (s, bi, s, skey->E.n);
|
|
+ }
|
|
}
|
|
while (!mpi_cmp_ui (s, 0));
|
|
|