whitespace

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

diff --git a/openssh/rsa.c b/openssh/rsa.c
index bec1d190bc2c9a30330128d62c46e833e80e271c..113ee7fc42347977adc011b5610c790d466c825c 100644 (file)
--- a/openssh/rsa.c
+++ b/openssh/rsa.c
@@ -1,4 +1,3 @@
-/* $OpenBSD: rsa.c,v 1.29 2006/11/06 21:25:28 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -61,15 +60,11 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: rsa.c,v 1.23 2001/06/27 05:42:24 markus Exp $");
 
-#include <sys/types.h>
-
-#include <stdarg.h>
-#include <string.h>
-
-#include "xmalloc.h"
 #include "rsa.h"
 #include "log.h"
+#include "xmalloc.h"
 
 void
 rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
@@ -91,8 +86,7 @@ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
            RSA_PKCS1_PADDING)) <= 0)
                fatal("rsa_public_encrypt() failed");
 
-       if (BN_bin2bn(outbuf, len, out) == NULL)
-               fatal("rsa_public_encrypt: BN_bin2bn failed");
+       BN_bin2bn(outbuf, len, out);
 
        memset(outbuf, 0, olen);
        memset(inbuf, 0, ilen);
@@ -117,8 +111,7 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
            RSA_PKCS1_PADDING)) <= 0) {
                error("rsa_private_decrypt() failed");
        } else {
-               if (BN_bin2bn(outbuf, len, out) == NULL)
-                       fatal("rsa_private_decrypt: BN_bin2bn failed");
+               BN_bin2bn(outbuf, len, out);
        }
        memset(outbuf, 0, olen);
        memset(inbuf, 0, ilen);
@@ -127,23 +120,20 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
        return len;
 }
 
-/* calculate p-1 and q-1 */
 void
 rsa_generate_additional_parameters(RSA *rsa)
 {
        BIGNUM *aux;
        BN_CTX *ctx;
+       /* Generate additional parameters */
+       aux = BN_new();
+       ctx = BN_CTX_new();
 
-       if ((aux = BN_new()) == NULL)
-               fatal("rsa_generate_additional_parameters: BN_new failed");
-       if ((ctx = BN_CTX_new()) == NULL)
-               fatal("rsa_generate_additional_parameters: BN_CTX_new failed");
+       BN_sub(aux, rsa->q, BN_value_one());
+       BN_mod(rsa->dmq1, rsa->d, aux, ctx);
 
-       if ((BN_sub(aux, rsa->q, BN_value_one()) == 0) ||
-           (BN_mod(rsa->dmq1, rsa->d, aux, ctx) == 0) ||
-           (BN_sub(aux, rsa->p, BN_value_one()) == 0) ||
-           (BN_mod(rsa->dmp1, rsa->d, aux, ctx) == 0))
-               fatal("rsa_generate_additional_parameters: BN_sub/mod failed");
+       BN_sub(aux, rsa->p, BN_value_one());
+       BN_mod(rsa->dmp1, rsa->d, aux, ctx);
 
        BN_clear_free(aux);
        BN_CTX_free(ctx);