2
0

061-0001-OpenSSL-Use-constant-time-operations-for-private-big.patch 3.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  1. From d42c477cc794163a3757956bbffca5cea000923c Mon Sep 17 00:00:00 2001
  2. From: Jouni Malinen <[email protected]>
  3. Date: Tue, 26 Feb 2019 11:43:03 +0200
  4. Subject: [PATCH 01/14] OpenSSL: Use constant time operations for private
  5. bignums
  6. This helps in reducing measurable timing differences in operations
  7. involving private information. BoringSSL has removed BN_FLG_CONSTTIME
  8. and expects specific constant time functions to be called instead, so a
  9. bit different approach is needed depending on which library is used.
  10. The main operation that needs protection against side channel attacks is
  11. BN_mod_exp() that depends on private keys (the public key validation
  12. step in crypto_dh_derive_secret() is an exception that can use the
  13. faster version since it does not depend on private keys).
  14. crypto_bignum_div() is currently used only in SAE FFC case with not
  15. safe-prime groups and only with values that do not depend on private
  16. keys, so it is not critical to protect it.
  17. crypto_bignum_inverse() is currently used only in SAE FFC PWE
  18. derivation. The additional protection here is targeting only OpenSSL.
  19. BoringSSL may need conversion to using BN_mod_inverse_blinded().
  20. This is related to CVE-2019-9494 and CVE-2019-9495.
  21. Signed-off-by: Jouni Malinen <[email protected]>
  22. ---
  23. src/crypto/crypto_openssl.c | 20 +++++++++++++++-----
  24. 1 file changed, 15 insertions(+), 5 deletions(-)
  25. --- a/src/crypto/crypto_openssl.c
  26. +++ b/src/crypto/crypto_openssl.c
  27. @@ -549,7 +549,8 @@ int crypto_mod_exp(const u8 *base, size_
  28. bn_result == NULL)
  29. goto error;
  30. - if (BN_mod_exp(bn_result, bn_base, bn_exp, bn_modulus, ctx) != 1)
  31. + if (BN_mod_exp_mont_consttime(bn_result, bn_base, bn_exp, bn_modulus,
  32. + ctx, NULL) != 1)
  33. goto error;
  34. *result_len = BN_bn2bin(bn_result, result);
  35. @@ -1295,8 +1296,9 @@ int crypto_bignum_exptmod(const struct c
  36. bnctx = BN_CTX_new();
  37. if (bnctx == NULL)
  38. return -1;
  39. - res = BN_mod_exp((BIGNUM *) d, (const BIGNUM *) a, (const BIGNUM *) b,
  40. - (const BIGNUM *) c, bnctx);
  41. + res = BN_mod_exp_mont_consttime((BIGNUM *) d, (const BIGNUM *) a,
  42. + (const BIGNUM *) b, (const BIGNUM *) c,
  43. + bnctx, NULL);
  44. BN_CTX_free(bnctx);
  45. return res ? 0 : -1;
  46. @@ -1315,6 +1317,11 @@ int crypto_bignum_inverse(const struct c
  47. bnctx = BN_CTX_new();
  48. if (bnctx == NULL)
  49. return -1;
  50. +#ifdef OPENSSL_IS_BORINGSSL
  51. + /* TODO: use BN_mod_inverse_blinded() ? */
  52. +#else /* OPENSSL_IS_BORINGSSL */
  53. + BN_set_flags((BIGNUM *) a, BN_FLG_CONSTTIME);
  54. +#endif /* OPENSSL_IS_BORINGSSL */
  55. res = BN_mod_inverse((BIGNUM *) c, (const BIGNUM *) a,
  56. (const BIGNUM *) b, bnctx);
  57. BN_CTX_free(bnctx);
  58. @@ -1348,6 +1355,9 @@ int crypto_bignum_div(const struct crypt
  59. bnctx = BN_CTX_new();
  60. if (bnctx == NULL)
  61. return -1;
  62. +#ifndef OPENSSL_IS_BORINGSSL
  63. + BN_set_flags((BIGNUM *) a, BN_FLG_CONSTTIME);
  64. +#endif /* OPENSSL_IS_BORINGSSL */
  65. res = BN_div((BIGNUM *) c, NULL, (const BIGNUM *) a,
  66. (const BIGNUM *) b, bnctx);
  67. BN_CTX_free(bnctx);
  68. @@ -1439,8 +1449,8 @@ int crypto_bignum_legendre(const struct
  69. /* exp = (p-1) / 2 */
  70. !BN_sub(exp, (const BIGNUM *) p, BN_value_one()) ||
  71. !BN_rshift1(exp, exp) ||
  72. - !BN_mod_exp(tmp, (const BIGNUM *) a, exp, (const BIGNUM *) p,
  73. - bnctx))
  74. + !BN_mod_exp_mont_consttime(tmp, (const BIGNUM *) a, exp,
  75. + (const BIGNUM *) p, bnctx, NULL))
  76. goto fail;
  77. if (BN_is_word(tmp, 1))