[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  653b883b97f72a15d35d21246696881aa65311e2 (commit)
      from  92d9d0ae2b10b12e42d33047b60e64ebfc296596 (commit)


- Log -----------------------------------------------------------------
commit 653b883b97f72a15d35d21246696881aa65311e2
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Thu Aug 15 22:51:57 2019 +0200

    Fix 9bf682f which broke nistp224_method
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9607)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ecp_nistp224.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 89ea039b2c..4725e28724 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -291,10 +291,10 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
         ec_key_simple_generate_public_key,
         0, /* keycopy */
         0, /* keyfinish */
+        ecdh_simple_compute_key,
         ecdsa_simple_sign_setup,
         ecdsa_simple_sign_sig,
         ecdsa_simple_verify_sig,
-        ecdh_simple_compute_key,
         0, /* field_inverse_mod_ord */
         0, /* blind_coordinates */
         0, /* ladder_pre */