summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-11-21 21:24:55 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-11-21 21:24:55 +0000
commit14920293713ff4a5bbe45b495694bfd925d73894 (patch)
treed0f63720bdcbc574dc3c018beeb28e6da4b5e1fb /ssh-keygen.c
parent4a1d91646d4248c111f573e496cc0d10ba62e274 (diff)
20001123
- (bal) Merge OpenBSD changes: - markus@cvs.openbsd.org 2000/11/15 22:31:36 [auth-options.c] case insensitive key options; from stevesk@sweeden.hp.com - markus@cvs.openbsd.org 2000/11/16 17:55:43 [dh.c] do not use perror() in sshd, after child is forked() - markus@cvs.openbsd.org 2000/11/14 23:42:40 [auth-rsa.c] parse option only if key matches; fix some confusing seen by the client - markus@cvs.openbsd.org 2000/11/14 23:44:19 [session.c] check no_agent_forward_flag for ssh-2, too - markus@cvs.openbsd.org 2000/11/15 [ssh-agent.1] reorder SYNOPSIS; typo, use .It - markus@cvs.openbsd.org 2000/11/14 23:48:55 [ssh-agent.c] do not reorder keys if a key is removed - markus@cvs.openbsd.org 2000/11/15 19:58:08 [ssh.c] just ignore non existing user keys - millert@cvs.openbsd.org 200/11/15 20:24:43 [ssh-keygen.c] Add missing \n at end of error message.
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 3653fc244..5da90035a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.33 2000/11/12 19:50:38 markus Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.34 2000/11/15 20:24:43 millert Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -727,7 +727,7 @@ main(int ac, char **av)
727 if (key_type_name != NULL) { 727 if (key_type_name != NULL) {
728 type = key_type_from_name(key_type_name); 728 type = key_type_from_name(key_type_name);
729 if (type == KEY_UNSPEC) { 729 if (type == KEY_UNSPEC) {
730 fprintf(stderr, "unknown key type %s", key_type_name); 730 fprintf(stderr, "unknown key type %s\n", key_type_name);
731 exit(1); 731 exit(1);
732 } 732 }
733 } 733 }