diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2-chall.c | 4 | ||||
-rw-r--r-- | auth2.c | 4 | ||||
-rw-r--r-- | sshconnect1.c | 8 |
4 files changed, 12 insertions, 9 deletions
@@ -7,6 +7,9 @@ | |||
7 | - markus@cvs.openbsd.org 2001/09/27 11:59:37 | 7 | - markus@cvs.openbsd.org 2001/09/27 11:59:37 |
8 | [packet.c] | 8 | [packet.c] |
9 | missing called=1; chombier@mac.com | 9 | missing called=1; chombier@mac.com |
10 | - markus@cvs.openbsd.org 2001/09/27 15:31:17 | ||
11 | [auth2.c auth2-chall.c sshconnect1.c] | ||
12 | typos; from solar | ||
10 | 13 | ||
11 | 20011001 | 14 | 20011001 |
12 | - (stevesk) loginrec.c: fix type conversion problems exposed when using | 15 | - (stevesk) loginrec.c: fix type conversion problems exposed when using |
@@ -6599,4 +6602,4 @@ | |||
6599 | - Wrote replacements for strlcpy and mkdtemp | 6602 | - Wrote replacements for strlcpy and mkdtemp |
6600 | - Released 1.0pre1 | 6603 | - Released 1.0pre1 |
6601 | 6604 | ||
6602 | $Id: ChangeLog,v 1.1571 2001/10/03 17:10:17 mouring Exp $ | 6605 | $Id: ChangeLog,v 1.1572 2001/10/03 17:12:43 mouring Exp $ |
diff --git a/auth2-chall.c b/auth2-chall.c index 5afd7d769..5e6a691f8 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-chall.c,v 1.7 2001/06/23 15:12:17 itojun Exp $"); | 26 | RCSID("$OpenBSD: auth2-chall.c,v 1.8 2001/09/27 15:31:17 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "auth.h" | 29 | #include "auth.h" |
@@ -139,7 +139,7 @@ kbdint_next_device(KbdintAuthctxt *kbdintctxt) | |||
139 | } | 139 | } |
140 | 140 | ||
141 | /* | 141 | /* |
142 | * try challenge-reponse, set authctxt->postponed if we have to | 142 | * try challenge-response, set authctxt->postponed if we have to |
143 | * wait for the response. | 143 | * wait for the response. |
144 | */ | 144 | */ |
145 | int | 145 | int |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.70 2001/09/20 13:46:48 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.71 2001/09/27 15:31:17 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -122,7 +122,7 @@ do_authentication2() | |||
122 | 122 | ||
123 | x_authctxt = authctxt; /*XXX*/ | 123 | x_authctxt = authctxt; /*XXX*/ |
124 | 124 | ||
125 | /* challenge-reponse is implemented via keyboard interactive */ | 125 | /* challenge-response is implemented via keyboard interactive */ |
126 | if (options.challenge_response_authentication) | 126 | if (options.challenge_response_authentication) |
127 | options.kbd_interactive_authentication = 1; | 127 | options.kbd_interactive_authentication = 1; |
128 | if (options.pam_authentication_via_kbd_int) | 128 | if (options.pam_authentication_via_kbd_int) |
diff --git a/sshconnect1.c b/sshconnect1.c index 8575081ed..05cd9f6d6 100644 --- a/sshconnect1.c +++ b/sshconnect1.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect1.c,v 1.39 2001/07/05 20:32:47 stevesk Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.40 2001/09/27 15:31:17 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/evp.h> | 19 | #include <openssl/evp.h> |
@@ -820,9 +820,9 @@ try_challenge_response_authentication(void) | |||
820 | u_int clen; | 820 | u_int clen; |
821 | char prompt[1024]; | 821 | char prompt[1024]; |
822 | char *challenge, *response; | 822 | char *challenge, *response; |
823 | 823 | ||
824 | debug("Doing challenge reponse authentication."); | 824 | debug("Doing challenge response authentication."); |
825 | 825 | ||
826 | for (i = 0; i < options.number_of_password_prompts; i++) { | 826 | for (i = 0; i < options.number_of_password_prompts; i++) { |
827 | /* request a challenge */ | 827 | /* request a challenge */ |
828 | packet_start(SSH_CMSG_AUTH_TIS); | 828 | packet_start(SSH_CMSG_AUTH_TIS); |