merged OpenSSH 5.3p1 to trunk

[gssapi-openssh.git] / openssh / bufbn.c

diff --git a/openssh/bufbn.c b/openssh/bufbn.c
index 9706ba8a86bb39c15727746e6270d92f90ceeb47..6cf65d372ef60ea8616b89bcad7a701e559083fd 100644 (file)
--- a/openssh/bufbn.c
+++ b/openssh/bufbn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bufbn.c,v 1.4 2006/11/06 21:25:28 markus Exp $*/
+/* $OpenBSD: bufbn.c,v 1.3 2006/08/03 03:34:41 deraadt Exp $*/
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -118,10 +118,7 @@ buffer_get_bignum_ret(Buffer *buffer, BIGNUM *value)
                return (-1);
        }
        bin = buffer_ptr(buffer);
-       if (BN_bin2bn(bin, bytes, value) == NULL) {
-               error("buffer_get_bignum_ret: BN_bin2bn failed");
-               return (-1);
-       }
+       BN_bin2bn(bin, bytes, value);
        if (buffer_consume_ret(buffer, bytes) == -1) {
                error("buffer_get_bignum_ret: buffer_consume failed");
                return (-1);
@@ -205,10 +202,7 @@ buffer_get_bignum2_ret(Buffer *buffer, BIGNUM *value)
                xfree(bin);
                return (-1);
        }
-       if (BN_bin2bn(bin, len, value) == NULL) {
-               error("buffer_get_bignum2_ret: BN_bin2bn failed");
-               return (-1);
-       }
+       BN_bin2bn(bin, len, value);
        xfree(bin);
        return (0);
 }