[openssl/openssl] 925058: Avoid generating RSA keys with p < q

[Rajarshi Karmakar]

  Branch: refs/heads/openssl-3.1
  Home:   https://github.com/openssl/openssl
  Commit: 925058987e4b48ed5c71bbf46742713b50feeb2d
      https://github.com/openssl/openssl/commit/925058987e4b48ed5c71bbf46742713b50feeb2d
  Author: rkarmaka98 <rkarmaka98 at gmail.com>
  Date:   2023-04-28 (Fri, 28 Apr 2023)

  Changed paths:
    M crypto/rsa/rsa_sp800_56b_gen.c

  Log Message:
  -----------
  Avoid generating RSA keys with p < q

We swap p and q in that case except when ACVP tests are being run.

Fixes #20823

Reviewed-by: Tom Cosgrove <tom.cosgrove at arm.com>
Reviewed-by: Paul Dale <pauli at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20833)

(cherry picked from commit dc231eb598460aec239c7f597f560bca47d9f72a)