commit 1001e32d6f74469f181ca6e687eeed23641c2d02
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Sun Oct 27 14:53:48 2013 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Oct 28 14:01:08 2013 +0100
tree e40e70159349be4102345ce7437db1f718e36794
parent 21ef42f257dec3aee48d6f314579fa891e0309c5

Fix return value of ecdsa_from_keypair()

library/ecdsa.c

diff --git a/library/ecdsa.c b/library/ecdsa.c
index 91777ec..f653748 100644
--- a/library/ecdsa.c
+++ b/library/ecdsa.c
@@ -291,12 +291,14 @@
  */
 int ecdsa_from_keypair( ecdsa_context *ctx, const ecp_keypair *key )
 {
-    int ret = ecp_group_copy( &ctx->grp, &key->grp ) ||
-              mpi_copy( &ctx->d, &key->d ) ||
-              ecp_copy( &ctx->Q, &key->Q );
+    int ret;
 
-    if( ret != 0 )
+    if( ( ret = ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 ||
+        ( ret = mpi_copy( &ctx->d, &key->d ) ) != 0 ||
+        ( ret = ecp_copy( &ctx->Q, &key->Q ) ) != 0 )
+    {
         ecdsa_free( ctx );
+    }
 
     return( ret );
 }