* gnu/services/ssh.scm (openssh-config-file): Remove them.
(<openssh-configuration>)[rsa-authentication?]: Remove it.
(<openssh-configuration>)[protocol-number]: Remove it.
* doc/guix.texi (Networking Services): Remove them.
---
doc/guix.texi | 8 --------
gnu/services/ssh.scm | 10 ----------
2 files changed, 18 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 22eef3a64..fdfb88046 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9151,19 +9151,11 @@ false, users have to use other authentication method.
Authorized public keys are stored in @file{~/.ssh/authorized_keys}.
This is used only by protocol version 2.
-@item @code{rsa-authentication?} (default: @code{#t})
-When true, users may log in using pure RSA authentication. When false,
-users have to use other means of authentication. This is used only by
-protocol 1.
-
@item @code{x11-forwarding?} (default: @code{#f})
When true, forwarding of X11 graphical client connections is
enabled---in other words, @command{ssh} options @option{-X} and
@option{-Y} will work.
-@item @code{protocol-number} (default: @code{2})
-The SSH protocol number to use.
-
@item @code{challenge-response-authentication?} (default: @code{#f})
Specifies whether challenge response authentication is allowed (e.g. via
PAM).
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 78641f526..fe4598927 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -273,12 +273,8 @@ The other options should be self-descriptive."
(default #t))
(public-key-authentication? openssh-configuration-public-key-authentication?
(default #t)) ;Boolean
- (rsa-authentication? openssh-configuration-rsa-authentication? ;Boolean
- (default #t))
(x11-forwarding? openssh-configuration-x11-forwarding? ;Boolean
(default #f))
- (protocol-number openssh-configuration-protocol-number ;integer
- (default 2))
(challenge-response-authentication?
openssh-challenge-response-authentication?
(default #f)) ;Boolean
(use-pam? openssh-configuration-use-pam?
@@ -311,9 +307,6 @@ The other options should be self-descriptive."
#~(call-with-output-file #$output
(lambda (port)
(display "# Generated by 'openssh-service'.\n" port)
- (format port "Protocol ~a\n"
- #$(if (eq? (openssh-configuration-protocol-number config) 1)
- "1" "2"))
(format port "Port ~a\n"
#$(number->string (openssh-configuration-port-number config)))
(format port "PermitRootLogin ~a\n"
@@ -330,9 +323,6 @@ The other options should be self-descriptive."
(format port "PubkeyAuthentication ~a\n"
#$(if (openssh-configuration-public-key-authentication?
config)
"yes" "no"))
- (format port "RSAAuthentication ~a\n"
- #$(if (openssh-configuration-rsa-authentication? config)
- "yes" "no"))
(format port "X11Forwarding ~a\n"
#$(if (openssh-configuration-x11-forwarding? config)
"yes" "no"))
--
2.11.1
