- Reduce diff against OpenBSD source

[openssh.git] / authfd.c

diff --git a/authfd.c b/authfd.c
index e30eab8b9ccef1cb3bdc65e7c2d82746240bc357..bea665575d873f3bd5e293084ccd6086c7a83277 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -1,16 +1,16 @@
 /*
- * 
+ *
  * authfd.c
- * 
+ *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
+ *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
+ *
  * Created: Wed Mar 29 01:30:28 1995 ylo
- * 
+ *
  * Functions for connecting the local authentication agent.
- * 
+ *
  */
 
 #include "includes.h"
@@ -24,12 +24,7 @@ RCSID("$Id$");
 #include "xmalloc.h"
 #include "getput.h"
 
-#ifdef HAVE_OPENSSL
 #include <openssl/rsa.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/rsa.h>
-#endif
 
 /* Returns the number of the authentication fd, or -1 if there is none. */
 
@@ -69,7 +64,7 @@ ssh_get_authentication_socket()
  * ssh_get_authentication_socket().
  */
 
-void 
+void
 ssh_close_authentication_socket(int sock)
 {
        if (getenv(SSH_AUTHSOCKET_ENV_NAME))
@@ -113,7 +108,7 @@ ssh_get_authentication_connection()
  * memory.
  */
 
-void 
+void
 ssh_close_authentication_connection(AuthenticationConnection *ac)
 {
        buffer_free(&ac->packet);
@@ -222,7 +217,7 @@ ssh_get_next_identity(AuthenticationConnection *auth,
        *comment = buffer_get_string(&auth->identities, NULL);
 
        if (bits != BN_num_bits(n))
-               error("Warning: keysize mismatch: actual %d, announced %u",
+               error("Warning: identity keysize mismatch: actual %d, announced %u",
                      BN_num_bits(n), bits);
 
        /* Decrement the number of remaining entries. */
@@ -343,7 +338,7 @@ error_cleanup:
  * be used by normal applications.
  */
 
-int 
+int
 ssh_add_identity(AuthenticationConnection *auth,
                 RSA * key, const char *comment)
 {
@@ -431,7 +426,7 @@ error_cleanup:
  * meant to be used by normal applications.
  */
 
-int 
+int
 ssh_remove_identity(AuthenticationConnection *auth, RSA *key)
 {
        Buffer buffer;
@@ -514,7 +509,7 @@ error_cleanup:
  * by normal applications.
  */
 
-int 
+int
 ssh_remove_all_identities(AuthenticationConnection *auth)
 {
        Buffer buffer;