- Merged very large OpenBSD source code reformat

 - OpenBSD CVS updates
   - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
     [ssh.h sshd.8 sshd.c]
     syslog changes:
     * Unified Logmessage for all auth-types, for success and for failed
     * Standard connections get only ONE line in the LOG when level==LOG:
       Auth-attempts are logged only, if authentication is:
          a) successfull or
          b) with passwd or
          c) we had more than AUTH_FAIL_LOG failues
     * many log() became verbose()
     * old behaviour with level=VERBOSE
   - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
     tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
     messages. allows use of s/key in windows (ttssh, securecrt) and
     ssh-1.2.27 clients without 'ssh -v', ok: niels@
   - [sshd.8]
     -V, for fallback to openssh in SSH2 compatibility mode
   - [sshd.c]
     fix sigchld race; cjc5@po.cwru.edu

1 files changed, 115 insertions, 116 deletions

diff --git a/rsa.c b/rsa.c
index 61e53759..5228fd39 100644
--- a/rsa.c
+++ b/rsa.c
@@ -1,41 +1,41 @@
 /*
-
-rsa.c
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-                   All rights reserved
-
-Created: Fri Mar  3 22:07:06 1995 ylo
-
-Description of the RSA algorithm can be found e.g. from the following sources:
-
-  Bruce Schneier: Applied Cryptography.  John Wiley & Sons, 1994.
-
-  Jennifer Seberry and Josed Pieprzyk: Cryptography: An Introduction to 
-    Computer Security.  Prentice-Hall, 1989.
-
-  Man Young Rhee: Cryptography and Secure Data Communications.  McGraw-Hill, 
-    1994.
-
-  R. Rivest, A. Shamir, and L. M. Adleman: Cryptographic Communications
-    System and Method.  US Patent 4,405,829, 1983.
-
-  Hans Riesel: Prime Numbers and Computer Methods for Factorization.  
-    Birkhauser, 1994.
-
-  The RSA Frequently Asked Questions document by RSA Data Security, Inc., 1995.
-
-  RSA in 3 lines of perl by Adam Back <aba@atlax.ex.ac.uk>, 1995, as included
-    below:
-
-    gone - had to be deleted - what a pity
-
+ * 
+ * rsa.c
+ * 
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * 
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * 
+ * Created: Fri Mar  3 22:07:06 1995 ylo
+ * 
+ * Description of the RSA algorithm can be found e.g. from the following sources:
+ * 
+ *   Bruce Schneier: Applied Cryptography.  John Wiley & Sons, 1994.
+ * 
+ *   Jennifer Seberry and Josed Pieprzyk: Cryptography: An Introduction to
+ *   Computer Security.  Prentice-Hall, 1989.
+ * 
+ *   Man Young Rhee: Cryptography and Secure Data Communications.  McGraw-Hill,
+ *   1994.
+ * 
+ *   R. Rivest, A. Shamir, and L. M. Adleman: Cryptographic Communications
+ *   System and Method.  US Patent 4,405,829, 1983.
+ * 
+ *   Hans Riesel: Prime Numbers and Computer Methods for Factorization.
+ *   Birkhauser, 1994.
+ * 
+ *   The RSA Frequently Asked Questions document by RSA Data Security, Inc., 1995.
+ * 
+ *   RSA in 3 lines of perl by Adam Back <aba@atlax.ex.ac.uk>, 1995, as included
+ *   below:
+ * 
+ *     [gone - had to be deleted - what a pity]
+ * 
 */
 
 #include "includes.h"
-RCSID("$Id: rsa.c,v 1.3 1999/11/08 23:35:52 damien Exp $");
+RCSID("$Id: rsa.c,v 1.4 1999/11/24 13:26:22 damien Exp $");
 
 #include "rsa.h"
 #include "ssh.h"
@@ -46,13 +46,13 @@ int rsa_verbose = 1;
 int
 rsa_alive()
 {
-  RSA *key;
+	RSA *key;
 
-  key = RSA_generate_key(32, 3, NULL, NULL);
-  if (key == NULL)
-    return (0);
-  RSA_free(key);
-  return (1);
+	key = RSA_generate_key(32, 3, NULL, NULL);
+	if (key == NULL)
+		return (0);
+	RSA_free(key);
+	return (1);
 }
 
 /* Generates RSA public and private keys.  This initializes the data
@@ -62,101 +62,100 @@ rsa_alive()
 void
 rsa_generate_key(RSA *prv, RSA *pub, unsigned int bits)
 {
-  RSA *key;
-
-  if (rsa_verbose) {
-    printf("Generating RSA keys:  "); 
-    fflush(stdout);
-  }
-
-  key = RSA_generate_key(bits, 35, NULL, NULL);
-  if (key == NULL)
-    fatal("rsa_generate_key: key generation failed.");
-
-  /* Copy public key parameters */
-  pub->n = BN_new();
-  BN_copy(pub->n, key->n);
-  pub->e = BN_new();
-  BN_copy(pub->e, key->e);
-
-  /* Copy private key parameters */
-  prv->n = BN_new();
-  BN_copy(prv->n, key->n);
-  prv->e = BN_new();
-  BN_copy(prv->e, key->e);
-  prv->d = BN_new();
-  BN_copy(prv->d, key->d);
-  prv->p = BN_new();
-  BN_copy(prv->p, key->p);
-  prv->q = BN_new();
-  BN_copy(prv->q, key->q);
-
-  prv->dmp1 = BN_new();
-  BN_copy(prv->dmp1, key->dmp1);
-
-  prv->dmq1 = BN_new();
-  BN_copy(prv->dmq1, key->dmq1);
-
-  prv->iqmp = BN_new();
-  BN_copy(prv->iqmp, key->iqmp);
-
-  RSA_free(key);
-  
-  if (rsa_verbose)
-    printf("Key generation complete.\n");
+	RSA *key;
+
+	if (rsa_verbose) {
+		printf("Generating RSA keys:  ");
+		fflush(stdout);
+	}
+	key = RSA_generate_key(bits, 35, NULL, NULL);
+	if (key == NULL)
+		fatal("rsa_generate_key: key generation failed.");
+
+	/* Copy public key parameters */
+	pub->n = BN_new();
+	BN_copy(pub->n, key->n);
+	pub->e = BN_new();
+	BN_copy(pub->e, key->e);
+
+	/* Copy private key parameters */
+	prv->n = BN_new();
+	BN_copy(prv->n, key->n);
+	prv->e = BN_new();
+	BN_copy(prv->e, key->e);
+	prv->d = BN_new();
+	BN_copy(prv->d, key->d);
+	prv->p = BN_new();
+	BN_copy(prv->p, key->p);
+	prv->q = BN_new();
+	BN_copy(prv->q, key->q);
+
+	prv->dmp1 = BN_new();
+	BN_copy(prv->dmp1, key->dmp1);
+
+	prv->dmq1 = BN_new();
+	BN_copy(prv->dmq1, key->dmq1);
+
+	prv->iqmp = BN_new();
+	BN_copy(prv->iqmp, key->iqmp);
+
+	RSA_free(key);
+
+	if (rsa_verbose)
+		printf("Key generation complete.\n");
 }
 
 void
-rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA* key)
+rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key)
 {
-  char *inbuf, *outbuf;
-  int len, ilen, olen;
+	char *inbuf, *outbuf;
+	int len, ilen, olen;
 
-  if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e))
-    fatal("rsa_public_encrypt() exponent too small or not odd");
+	if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e))
+		fatal("rsa_public_encrypt() exponent too small or not odd");
 
-  olen = BN_num_bytes(key->n);
-  outbuf = xmalloc(olen);
+	olen = BN_num_bytes(key->n);
+	outbuf = xmalloc(olen);
 
-  ilen = BN_num_bytes(in);
-  inbuf = xmalloc(ilen);
-  BN_bn2bin(in, inbuf);
+	ilen = BN_num_bytes(in);
+	inbuf = xmalloc(ilen);
+	BN_bn2bin(in, inbuf);
 
-  if ((len = RSA_public_encrypt(ilen, inbuf, outbuf, key,
-				RSA_PKCS1_PADDING)) <= 0)
-    fatal("rsa_public_encrypt() failed");
+	if ((len = RSA_public_encrypt(ilen, inbuf, outbuf, key,
+				      RSA_PKCS1_PADDING)) <= 0)
+		fatal("rsa_public_encrypt() failed");
 
-  BN_bin2bn(outbuf, len, out);
+	BN_bin2bn(outbuf, len, out);
 
-  memset(outbuf, 0, olen);
-  memset(inbuf, 0, ilen);
-  xfree(outbuf);
-  xfree(inbuf);
+	memset(outbuf, 0, olen);
+	memset(inbuf, 0, ilen);
+	xfree(outbuf);
+	xfree(inbuf);
 }
 
 void
 rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
 {
-  char *inbuf, *outbuf;
-  int len, ilen, olen;
+	char *inbuf, *outbuf;
+	int len, ilen, olen;
 
-  olen = BN_num_bytes(key->n);
-  outbuf = xmalloc(olen);
+	olen = BN_num_bytes(key->n);
+	outbuf = xmalloc(olen);
 
-  ilen = BN_num_bytes(in);
-  inbuf = xmalloc(ilen);
-  BN_bn2bin(in, inbuf);
+	ilen = BN_num_bytes(in);
+	inbuf = xmalloc(ilen);
+	BN_bn2bin(in, inbuf);
 
-  if ((len = RSA_private_decrypt(ilen, inbuf, outbuf, key,
-				 RSA_SSLV23_PADDING)) <= 0)
-    fatal("rsa_private_decrypt() failed");
+	if ((len = RSA_private_decrypt(ilen, inbuf, outbuf, key,
+				       RSA_SSLV23_PADDING)) <= 0)
+		fatal("rsa_private_decrypt() failed");
 
-  BN_bin2bn(outbuf, len, out);
+	BN_bin2bn(outbuf, len, out);
 
-  memset(outbuf, 0, olen);
-  memset(inbuf, 0, ilen);
-  xfree(outbuf);
-  xfree(inbuf);
+	memset(outbuf, 0, olen);
+	memset(inbuf, 0, ilen);
+	xfree(outbuf);
+	xfree(inbuf);
 }
 
 /* Set whether to output verbose messages during key generation. */
@@ -164,5 +163,5 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key)
 void
 rsa_set_verbose(int verbose)
 {
-  rsa_verbose = verbose;
+	rsa_verbose = verbose;
 }