Rest in Peace SSHv1

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>

1 files changed, 0 insertions, 36 deletions

diff --git a/src/auth.c b/src/auth.c
index 2e42a8bf..da746822 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -323,12 +323,6 @@ int ssh_userauth_list(ssh_session session, const char *username)
         return 0;
     }
 
-#ifdef WITH_SSH1
-    if(session->version == 1) {
-        return SSH_AUTH_METHOD_PASSWORD;
-    }
-#endif
-
     return session->auth_methods;
 }
 
@@ -354,12 +348,6 @@ int ssh_userauth_list(ssh_session session, const char *username)
 int ssh_userauth_none(ssh_session session, const char *username) {
     int rc;
 
-#ifdef WITH_SSH1
-    if (session->version == 1) {
-        return ssh_userauth1_none(session, username);
-    }
-#endif
-
     switch(session->pending_call_state){
         case SSH_PENDING_CALL_NONE:
             break;
@@ -454,12 +442,6 @@ int ssh_userauth_try_publickey(ssh_session session,
         return SSH_AUTH_ERROR;
     }
 
-#ifdef WITH_SSH1
-    if (session->version == 1) {
-        return SSH_AUTH_DENIED;
-    }
-#endif
-
     switch(session->pending_call_state) {
         case SSH_PENDING_CALL_NONE:
             break;
@@ -564,12 +546,6 @@ int ssh_userauth_publickey(ssh_session session,
         return SSH_AUTH_ERROR;
     }
 
-#ifdef WITH_SSH1
-    if (session->version == 1) {
-        return SSH_AUTH_DENIED;
-    }
-#endif
-
     switch(session->pending_call_state) {
         case SSH_PENDING_CALL_NONE:
             break;
@@ -1135,13 +1111,6 @@ int ssh_userauth_password(ssh_session session,
                           const char *password) {
     int rc;
 
-#ifdef WITH_SSH1
-    if (session->version == 1) {
-        rc = ssh_userauth1_password(session, username, password);
-        return rc;
-    }
-#endif
-
     switch(session->pending_call_state) {
         case SSH_PENDING_CALL_NONE:
             break;
@@ -1550,11 +1519,6 @@ int ssh_userauth_kbdint(ssh_session session, const char *user,
         return SSH_AUTH_ERROR;
     }
 
-#ifdef WITH_SSH1
-    if (session->version == 1) {
-        return SSH_AUTH_DENIED;
-    }
-#endif
     if ((session->pending_call_state == SSH_PENDING_CALL_NONE && session->kbdint == NULL) ||
             session->pending_call_state == SSH_PENDING_CALL_AUTH_KBDINT_INIT)
         rc = ssh_userauth_kbdint_init(session, user, submethods);