[rpms/openssl] rebase_40beta: Fix mistake in the FIPS RSA keygen causing key generation failures.

[rpms/openssl] rebase_40beta: Fix mistake in the FIPS RSA keygen causing key generation failures.

[Tomas Mraz]

A new commit has been pushed.

Repo   : rpms/openssl
Branch : rebase_40beta
Commit : 5d5075d4c92ad3014b234e3ba27f1367abe9b2dc
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date   : 2018-04-05T16:46:28+02:00
Stats  : +16/-16 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/openssl/c/5d5075d4c92ad3014b234e3ba27f1367abe9b2dc?branch=rebase_40beta

Log:
Fix mistake in the FIPS RSA keygen causing key generation failures.

---
diff --git a/openssl-1.1.0-fips.patch b/openssl-1.1.0-fips.patch
index 622d039..66f727d 100644
--- a/openssl-1.1.0-fips.patch
+++ b/openssl-1.1.0-fips.patch
@@ -11009,16 +11009,16 @@ diff -up openssl-1.1.0h/crypto/rsa/rsa_gen.c.fips openssl-1.1.0h/crypto/rsa/rsa_
 +                goto err;
 +            if (r > 0)
 +                break;
-+        }
-+        error = ERR_peek_last_error();
-+        if (ERR_GET_LIB(error) == ERR_LIB_BN
-+            && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
-+            /* GCD != 1 */
-+            ERR_pop_to_mark();
 +        } else {
-+            goto err;
++            error = ERR_peek_last_error();
++            if (ERR_GET_LIB(error) == ERR_LIB_BN
++                && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
++                /* GCD != 1 */
++                ERR_pop_to_mark();
++            } else {
++                goto err;
++            }
 +        }
-+
 +        if (!BN_GENCB_call(cb, 2, n++))
 +            goto err;
 +    }
@@ -11060,16 +11060,16 @@ diff -up openssl-1.1.0h/crypto/rsa/rsa_gen.c.fips openssl-1.1.0h/crypto/rsa/rsa_
 +                goto err;
 +            if (r > 0)
 +                break;
-+        }
-+        error = ERR_peek_last_error();
-+        if (ERR_GET_LIB(error) == ERR_LIB_BN
-+            && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
-+            /* GCD != 1 */
-+            ERR_pop_to_mark();
 +        } else {
-+            goto err;
++            error = ERR_peek_last_error();
++            if (ERR_GET_LIB(error) == ERR_LIB_BN
++                && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
++                /* GCD != 1 */
++                ERR_pop_to_mark();
++            } else {
++                goto err;
++            }
 +        }
-+
 +        if (!BN_GENCB_call(cb, 2, n++))
 +            goto err;
 +    }