Blame SOURCES/openssl-1.0.2k-cve-2018-0737.patch

450916
diff -up openssl-1.0.2k/crypto/rsa/rsa_gen.c.gen-timing openssl-1.0.2k/crypto/rsa/rsa_gen.c
450916
--- openssl-1.0.2k/crypto/rsa/rsa_gen.c.gen-timing	2018-06-18 13:46:24.323138691 +0200
450916
+++ openssl-1.0.2k/crypto/rsa/rsa_gen.c	2018-06-18 14:53:26.361975922 +0200
450916
@@ -1,6 +1,6 @@
450916
 /* crypto/rsa/rsa_gen.c */
450916
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
450916
- * Copyright (C) 2013 Red Hat, Inc.
450916
+ * Copyright (C) 2013, 2018 Red Hat, Inc.
450916
  * All rights reserved.
450916
  *
450916
  * This package is an SSL implementation written
450916
@@ -175,14 +175,13 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
                                    BN_GENCB *cb)
450916
 {
450916
     BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *r3 = NULL, *tmp;
450916
-    BIGNUM local_r0, local_d, local_p;
450916
-    BIGNUM *pr0, *d, *p;
450916
     BN_CTX *ctx = NULL;
450916
     int ok = -1;
450916
     int i;
450916
     int n = 0;
450916
     int test = 0;
450916
     int pbits = bits / 2;
450916
+    unsigned long error = 0;
450916
 
450916
     if (FIPS_selftest_failed()) {
450916
         FIPSerr(FIPS_F_RSA_BUILTIN_KEYGEN, FIPS_R_FIPS_SELFTEST_FAILED);
450916
@@ -251,6 +250,12 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
     if (!BN_is_zero(rsa->p) && !BN_is_zero(rsa->q))
450916
         test = 1;
450916
 
450916
+    BN_set_flags(r0, BN_FLG_CONSTTIME);
450916
+    BN_set_flags(r1, BN_FLG_CONSTTIME);
450916
+    BN_set_flags(r2, BN_FLG_CONSTTIME);
450916
+    BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
450916
+    BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
450916
+
450916
  retry:
450916
     /* generate p and q */
450916
     for (i = 0; i < 5 * pbits; i++) {
450916
@@ -266,9 +271,9 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
 
450916
         if (!BN_sub(r2, rsa->p, BN_value_one()))
450916
             goto err;
450916
-        if (!BN_gcd(r1, r2, rsa->e, ctx))
450916
-            goto err;
450916
-        if (BN_is_one(r1)) {
450916
+        ERR_set_mark();
450916
+        if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
450916
+            /* GCD == 1 since inverse exists */
450916
             int r;
450916
             r = BN_is_prime_fasttest_ex(rsa->p, pbits > 1024 ? 4 : 5, ctx, 0,
450916
                                         cb);
450916
@@ -276,8 +281,16 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
                 goto err;
450916
             if (r > 0)
450916
                 break;
450916
+        } else {
450916
+            error = ERR_peek_last_error();
450916
+            if (ERR_GET_LIB(error) == ERR_LIB_BN
450916
+                && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
450916
+                /* GCD != 1 */
450916
+                ERR_pop_to_mark();
450916
+            } else {
450916
+                goto err;
450916
+            }
450916
         }
450916
-
450916
         if (!BN_GENCB_call(cb, 2, n++))
450916
             goto err;
450916
     }
450916
@@ -309,9 +322,9 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
 
450916
         if (!BN_sub(r2, rsa->q, BN_value_one()))
450916
             goto err;
450916
-        if (!BN_gcd(r1, r2, rsa->e, ctx))
450916
-            goto err;
450916
-        if (BN_is_one(r1)) {
450916
+        ERR_set_mark();
450916
+        if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
450916
+            /* GCD == 1 since inverse exists */
450916
             int r;
450916
             r = BN_is_prime_fasttest_ex(rsa->q, pbits > 1024 ? 4 : 5, ctx, 0,
450916
                                         cb);
450916
@@ -319,8 +332,16 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
                 goto err;
450916
             if (r > 0)
450916
                 break;
450916
+        } else {
450916
+            error = ERR_peek_last_error();
450916
+            if (ERR_GET_LIB(error) == ERR_LIB_BN
450916
+                && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
450916
+                /* GCD != 1 */
450916
+                ERR_pop_to_mark();
450916
+            } else {
450916
+                goto err;
450916
+            }
450916
         }
450916
-
450916
         if (!BN_GENCB_call(cb, 2, n++))
450916
             goto err;
450916
     }
450916
@@ -355,51 +376,44 @@ static int FIPS_rsa_builtin_keygen(RSA *
450916
     if (!BN_sub(r2, rsa->q, BN_value_one()))
450916
         goto err;               /* q-1 */
450916
 
450916
+    /* note that computing gcd is not safe to timing attacks */
450916
     if (!BN_gcd(r0, r1, r2, ctx))
450916
         goto err;
450916
-    if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
450916
-        pr0 = &local_r0;
450916
-        BN_with_flags(pr0, r0, BN_FLG_CONSTTIME);
450916
-    } else
450916
-        pr0 = r0;
450916
-    if (!BN_div(r0, NULL, r1, pr0, ctx))
450916
-        goto err;
450916
-    if (!BN_mul(r0, r0, r2, ctx))
450916
-        goto err;               /* lcm(p-1, q-1) */
450916
-
450916
-    if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
450916
-        pr0 = &local_r0;
450916
-        BN_with_flags(pr0, r0, BN_FLG_CONSTTIME);
450916
-    } else
450916
-        pr0 = r0;
450916
-    if (!BN_mod_inverse(rsa->d, rsa->e, pr0, ctx))
450916
-        goto err;               /* d */
450916
+
450916
+    {
450916
+        if (!BN_div(r0, NULL, r1, r0, ctx))
450916
+            goto err;
450916
+
450916
+        if (!BN_mul(r0, r0, r2, ctx)) /* lcm(p-1, q-1) */
450916
+            goto err;
450916
+
450916
+        if (!BN_mod_inverse(rsa->d, rsa->e, r0, ctx)) /* d */
450916
+            goto err;
450916
+    }
450916
 
450916
     if (BN_num_bits(rsa->d) < pbits)
450916
         goto retry;             /* d is too small */
450916
 
450916
-    /* set up d for correct BN_FLG_CONSTTIME flag */
450916
-    if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
450916
-        d = &local_d;
450916
-        BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
450916
-    } else
450916
-        d = rsa->d;
450916
+    {
450916
+        BIGNUM *d = BN_new();
450916
 
450916
-    /* calculate d mod (p-1) */
450916
-    if (!BN_mod(rsa->dmp1, d, r1, ctx))
450916
-        goto err;
450916
+        if (d == NULL)
450916
+            goto err;
450916
+        BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
450916
 
450916
-    /* calculate d mod (q-1) */
450916
-    if (!BN_mod(rsa->dmq1, d, r2, ctx))
450916
-        goto err;
450916
+        if (/* calculate d mod (p-1) */
450916
+            !BN_mod(rsa->dmp1, d, r1, ctx)
450916
+            /* calculate d mod (q-1) */
450916
+            || !BN_mod(rsa->dmq1, d, r2, ctx)) {
450916
+            BN_free(d);
450916
+            goto err;
450916
+        }
450916
+        /* We MUST free d before any further use of rsa->d */
450916
+        BN_free(d);
450916
+    }
450916
 
450916
     /* calculate inverse of q mod p */
450916
-    if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
450916
-        p = &local_p;
450916
-        BN_with_flags(p, rsa->p, BN_FLG_CONSTTIME);
450916
-    } else
450916
-        p = rsa->p;
450916
-    if (!BN_mod_inverse(rsa->iqmp, rsa->q, p, ctx))
450916
+    if (!BN_mod_inverse(rsa->iqmp, rsa->q, rsa->p, ctx))
450916
         goto err;
450916
 
450916
     if (fips_rsa_pairwise_fail)
450916
@@ -431,6 +445,17 @@ static int rsa_builtin_keygen(RSA *rsa,
450916
     BIGNUM *pr0, *d, *p;
450916
     int bitsp, bitsq, ok = -1, n = 0;
450916
     BN_CTX *ctx = NULL;
450916
+    unsigned long error = 0;
450916
+
450916
+    /*
450916
+     * When generating ridiculously small keys, we can get stuck
450916
+     * continually regenerating the same prime values.
450916
+     */
450916
+    if (bits < 16) {
450916
+        ok = 0;             /* we set our own err */
450916
+        RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
450916
+        goto err;
450916
+    }
450916
 
450916
 #ifdef OPENSSL_FIPS
450916
     if (FIPS_module_mode()) {
450916
@@ -483,45 +508,55 @@ static int rsa_builtin_keygen(RSA *rsa,
450916
     if (BN_copy(rsa->e, e_value) == NULL)
450916
         goto err;
450916
 
450916
+    BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
450916
+    BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
450916
+    BN_set_flags(r2, BN_FLG_CONSTTIME);
450916
     /* generate p and q */
450916
     for (;;) {
450916
         if (!BN_generate_prime_ex(rsa->p, bitsp, 0, NULL, NULL, cb))
450916
             goto err;
450916
         if (!BN_sub(r2, rsa->p, BN_value_one()))
450916
             goto err;
450916
-        if (!BN_gcd(r1, r2, rsa->e, ctx))
450916
-            goto err;
450916
-        if (BN_is_one(r1))
450916
+        ERR_set_mark();
450916
+        if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
450916
+            /* GCD == 1 since inverse exists */
450916
             break;
450916
+        }
450916
+        error = ERR_peek_last_error();
450916
+        if (ERR_GET_LIB(error) == ERR_LIB_BN
450916
+            && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
450916
+            /* GCD != 1 */
450916
+            ERR_pop_to_mark();
450916
+        } else {
450916
+            goto err;
450916
+        }
450916
         if (!BN_GENCB_call(cb, 2, n++))
450916
             goto err;
450916
     }
450916
     if (!BN_GENCB_call(cb, 3, 0))
450916
         goto err;
450916
     for (;;) {
450916
-        /*
450916
-         * When generating ridiculously small keys, we can get stuck
450916
-         * continually regenerating the same prime values. Check for this and
450916
-         * bail if it happens 3 times.
450916
-         */
450916
-        unsigned int degenerate = 0;
450916
         do {
450916
             if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
450916
                 goto err;
450916
             if (!BN_sub(r2, rsa->q, rsa->p))
450916
                 goto err;
450916
-        } while ((BN_ucmp(r2, r3) <= 0) && (++degenerate < 3));
450916
-        if (degenerate == 3) {
450916
-            ok = 0;             /* we set our own err */
450916
-            RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
450916
-            goto err;
450916
-        }
450916
+        } while (BN_ucmp(r2, r3) <= 0);
450916
         if (!BN_sub(r2, rsa->q, BN_value_one()))
450916
             goto err;
450916
-        if (!BN_gcd(r1, r2, rsa->e, ctx))
450916
-            goto err;
450916
-        if (BN_is_one(r1))
450916
+        ERR_set_mark();
450916
+        if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
450916
+            /* GCD == 1 since inverse exists */
450916
             break;
450916
+        }
450916
+        error = ERR_peek_last_error();
450916
+        if (ERR_GET_LIB(error) == ERR_LIB_BN
450916
+            && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
450916
+            /* GCD != 1 */
450916
+            ERR_pop_to_mark();
450916
+        } else {
450916
+            goto err;
450916
+        }
450916
         if (!BN_GENCB_call(cb, 2, n++))
450916
             goto err;
450916
     }