summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--key.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dc325aa5..e2f4635ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
32 [sshpty.c] 32 [sshpty.c]
33 don't call error() for readonly /dev; from soekris list; ok mcbride, 33 don't call error() for readonly /dev; from soekris list; ok mcbride,
34 henning, deraadt. 34 henning, deraadt.
35 - markus@cvs.openbsd.org 2003/02/04 09:32:08
36 [key.c]
37 better debug3 message
35 38
3620030211 3920030211
37 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com 40 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1132,4 +1135,4 @@
1132 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1135 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1133 ok provos@ 1136 ok provos@
1134 1137
1135$Id: ChangeLog,v 1.2601 2003/02/24 00:54:10 djm Exp $ 1138$Id: ChangeLog,v 1.2602 2003/02/24 00:54:57 djm Exp $
diff --git a/key.c b/key.c
index 9806a729a..c87bfcbf0 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34#include "includes.h" 34#include "includes.h"
35RCSID("$OpenBSD: key.c,v 1.49 2002/09/09 14:54:14 markus Exp $"); 35RCSID("$OpenBSD: key.c,v 1.50 2003/02/04 09:32:08 markus Exp $");
36 36
37#include <openssl/evp.h> 37#include <openssl/evp.h>
38 38
@@ -410,14 +410,14 @@ key_read(Key *ret, char **cpp)
410 case KEY_DSA: 410 case KEY_DSA:
411 space = strchr(cp, ' '); 411 space = strchr(cp, ' ');
412 if (space == NULL) { 412 if (space == NULL) {
413 debug3("key_read: no space"); 413 debug3("key_read: missing whitespace");
414 return -1; 414 return -1;
415 } 415 }
416 *space = '\0'; 416 *space = '\0';
417 type = key_type_from_name(cp); 417 type = key_type_from_name(cp);
418 *space = ' '; 418 *space = ' ';
419 if (type == KEY_UNSPEC) { 419 if (type == KEY_UNSPEC) {
420 debug3("key_read: no key found"); 420 debug3("key_read: missing keytype");
421 return -1; 421 return -1;
422 } 422 }
423 cp = space+1; 423 cp = space+1;