diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -25,6 +25,9 @@ | |||
25 | - markus@cvs.openbsd.org 2003/05/15 03:08:29 | 25 | - markus@cvs.openbsd.org 2003/05/15 03:08:29 |
26 | [cipher.c cipher-bf1.c cipher-aes.c cipher-3des1.c] | 26 | [cipher.c cipher-bf1.c cipher-aes.c cipher-3des1.c] |
27 | split out custom EVP ciphers | 27 | split out custom EVP ciphers |
28 | - djm@cvs.openbsd.org 2003/05/15 03:10:52 | ||
29 | [ssh-keygen.c] | ||
30 | avoid warning; ok jakob@ | ||
28 | - (djm) Always parse UsePAM | 31 | - (djm) Always parse UsePAM |
29 | - (djm) Configure glue for DNS support (code doesn't work in portable yet) | 32 | - (djm) Configure glue for DNS support (code doesn't work in portable yet) |
30 | - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support) | 33 | - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support) |
@@ -1505,4 +1508,4 @@ | |||
1505 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1508 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1506 | ok provos@ | 1509 | ok provos@ |
1507 | 1510 | ||
1508 | $Id: ChangeLog,v 1.2711 2003/05/15 03:37:19 djm Exp $ | 1511 | $Id: ChangeLog,v 1.2712 2003/05/15 03:37:43 djm Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index f3ea4f1fd..c93d70bad 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" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.105 2003/05/14 18:16:20 jakob Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.106 2003/05/15 03:10:52 djm Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -31,6 +31,9 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.105 2003/05/14 18:16:20 jakob Exp $"); | |||
31 | #ifdef SMARTCARD | 31 | #ifdef SMARTCARD |
32 | #include "scard.h" | 32 | #include "scard.h" |
33 | #endif | 33 | #endif |
34 | #ifdef DNS | ||
35 | #include "dns.h" | ||
36 | #endif | ||
34 | 37 | ||
35 | /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ | 38 | /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ |
36 | int bits = 1024; | 39 | int bits = 1024; |