Resolve conflicts.

Sponsored by:	DARPA, NAI Labs

This commit is contained in:

Dag-Erling Smørgrav

2002-06-29 11:48:59 +00:00

parent d2a34caedb

commit a82e551f0f

27 changed files with 336 additions and 198 deletions

									
										crypto/openssh/authfile.c
									
		+4
		-3
	
												View File
												
				@@ -36,7 +36,8 @@

				 */

				#include "includes.h"

				RCSID("$OpenBSD: authfile.c,v 1.49 2002/05/23 19:24:30 markus Exp $");

				RCSID("$OpenBSD: authfile.c,v 1.50 2002/06/24 14:55:38 markus Exp $");

				RCSID("$FreeBSD$");

				#include <openssl/err.h>

				#include <openssl/evp.h>

				@@ -270,7 +271,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)

					(void) buffer_get_int(&buffer);		/* reserved */

					/* Read the public key from the buffer. */

					buffer_get_int(&buffer);

					(void) buffer_get_int(&buffer);

					pub = key_new(KEY_RSA1);

					buffer_get_bignum(&buffer, pub->rsa->n);

					buffer_get_bignum(&buffer, pub->rsa->e);

				@@ -357,7 +358,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,

					(void) buffer_get_int(&buffer);	/* Reserved data. */

					/* Read the public key from the buffer. */

					buffer_get_int(&buffer);

					(void) buffer_get_int(&buffer);

					prv = key_new_private(KEY_RSA1);

					buffer_get_bignum(&buffer, prv->rsa->n);