- markus@cvs.openbsd.org 2001/05/16 20:51:57

     [authfile.c]
     return comments for private pem files, too; report from nolan@naic.edu

diff --git a/ChangeLog b/ChangeLog
index 62d9e0d3e2ce58b14078ce0fc92206b75a6a0bfa..4d90cd3bef68b4b4f6876b01ae66bf8a105f0748 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - deraadt@cvs.openbsd.org 2001/05/15 22:04:01
      [ssh.1]
      X11 forwarding details improved
+   - markus@cvs.openbsd.org 2001/05/16 20:51:57
+     [authfile.c]
+     return comments for private pem files, too; report from nolan@naic.edu
 
 20010512
  - OpenBSD CVS Sync

diff --git a/authfile.c b/authfile.c
index 8234ba0789214aae7273cf09e88a7a432f133f49..2715bdef8c4e8929c89d2f4f935e30c5b805a153 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.33 2001/05/16 20:51:57 markus Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -558,7 +558,8 @@ key_load_private(const char *filename, const char *passphrase,
        lseek(fd, (off_t) 0, SEEK_SET);         /* rewind */
        if (pub == NULL) {
                /* closes fd */
-               return key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL);
+               return key_load_private_pem(fd, KEY_UNSPEC, passphrase,
+                   commentp);
        } else {
                /* it's a SSH v1 key if the public key part is readable */
                key_free(pub);