- markus@cvs.openbsd.org 2006/11/06 21:25:28

     [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c
     ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c]
     add missing checks for openssl return codes; with & ok djm@

1 files changed, 7 insertions, 5 deletions

diff --git a/scard.c b/scard.c
index 328655edd..9fd3ca1b4 100644
--- a/scard.c
+++ b/scard.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scard.c,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: scard.c,v 1.36 2006/11/06 21:25:28 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -391,15 +391,17 @@ sc_get_keys(const char *id, const char *pin)
         keys = xcalloc((nkeys+1), sizeof(Key *));
 
         n = key_new(KEY_RSA1);
-        BN_copy(n->rsa->n, k->rsa->n);
-        BN_copy(n->rsa->e, k->rsa->e);
+        if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+            (BN_copy(n->rsa->e, k->rsa->e) == NULL))
+                fatal("sc_get_keys: BN_copy failed");
         RSA_set_method(n->rsa, sc_get_rsa());
         n->flags |= KEY_FLAG_EXT;
         keys[0] = n;
 
         n = key_new(KEY_RSA);
-        BN_copy(n->rsa->n, k->rsa->n);
-        BN_copy(n->rsa->e, k->rsa->e);
+        if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+            (BN_copy(n->rsa->e, k->rsa->e) == NULL))
+                fatal("sc_get_keys: BN_copy failed");
         RSA_set_method(n->rsa, sc_get_rsa());
         n->flags |= KEY_FLAG_EXT;
         keys[1] = n;