- djm@cvs.openbsd.org 2014/06/24 01:13:21

     [Makefile.in auth-bsdauth.c auth-chall.c auth-options.c auth-rsa.c
     [auth2-none.c auth2-pubkey.c authfile.c authfile.h cipher-3des1.c
     [cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h
     [digest-libc.c digest-openssl.c digest.h dns.c entropy.c hmac.h
     [hostfile.c key.c key.h krl.c monitor.c packet.c rsa.c rsa.h
     [ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c
     [ssh-keygen.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c
     [ssh-rsa.c sshbuf-misc.c sshbuf.h sshconnect.c sshconnect1.c
     [sshconnect2.c sshd.c sshkey.c sshkey.h
     [openbsd-compat/openssl-compat.c openbsd-compat/openssl-compat.h]
     New key API: refactor key-related functions to be more library-like,
     existing API is offered as a set of wrappers.

     with and ok markus@

     Thanks also to Ben Hawkes, David Tomaschik, Ivan Fratric, Matthew
     Dempsky and Ron Bowes for a detailed review a few months ago.

     NB. This commit also removes portable OpenSSH support for OpenSSL
     <0.9.8e.

1 files changed, 10 insertions, 8 deletions

diff --git a/sshconnect1.c b/sshconnect1.c
index 921408ec1..62a7bd17f 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect1.c,v 1.74 2014/02/02 03:44:32 djm Exp $ */
+/* $OpenBSD: sshconnect1.c,v 1.75 2014/06/24 01:13:21 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -166,7 +166,7 @@ respond_to_rsa_challenge(BIGNUM * challenge, RSA * prv)
 
         /* Decrypt the challenge using the private key. */
         /* XXX think about Bleichenbacher, too */
-        if (rsa_private_decrypt(challenge, challenge, prv) <= 0)
+        if (rsa_private_decrypt(challenge, challenge, prv) != 0)
                 packet_disconnect(
                     "respond_to_rsa_challenge: rsa_private_decrypt failed");
 
@@ -253,7 +253,7 @@ try_rsa_authentication(int idx)
          * load the private key.  Try first with empty passphrase; if it
          * fails, ask for a passphrase.
          */
-        if (public->flags & KEY_FLAG_EXT)
+        if (public->flags & SSHKEY_FLAG_EXT)
                 private = public;
         else
                 private = key_load_private_type(KEY_RSA1, authfile, "", NULL,
@@ -302,7 +302,7 @@ try_rsa_authentication(int idx)
         respond_to_rsa_challenge(challenge, private->rsa);
 
         /* Destroy the private key unless it in external hardware. */
-        if (!(private->flags & KEY_FLAG_EXT))
+        if (!(private->flags & SSHKEY_FLAG_EXT))
                 key_free(private);
 
         /* We no longer need the challenge. */
@@ -592,8 +592,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
                             BN_num_bits(server_key->rsa->n),
                             SSH_KEY_BITS_RESERVED);
                 }
-                rsa_public_encrypt(key, key, server_key->rsa);
-                rsa_public_encrypt(key, key, host_key->rsa);
+                if (rsa_public_encrypt(key, key, server_key->rsa) != 0 ||
+                    rsa_public_encrypt(key, key, host_key->rsa) != 0)
+                        fatal("%s: rsa_public_encrypt failed", __func__);
         } else {
                 /* Host key has smaller modulus (or they are equal). */
                 if (BN_num_bits(server_key->rsa->n) <
@@ -604,8 +605,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
                             BN_num_bits(host_key->rsa->n),
                             SSH_KEY_BITS_RESERVED);
                 }
-                rsa_public_encrypt(key, key, host_key->rsa);
-                rsa_public_encrypt(key, key, server_key->rsa);
+                if (rsa_public_encrypt(key, key, host_key->rsa) != 0 ||
+                    rsa_public_encrypt(key, key, server_key->rsa) != 0)
+                        fatal("%s: rsa_public_encrypt failed", __func__);
         }
 
         /* Destroy the public keys since we no longer need them. */