[BACK]Return to ssh-keysign.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / crypto / external / bsd / openssh / dist

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/crypto/external/bsd/openssh/dist/ssh-keysign.c between version 1.13 and 1.13.10.1

version 1.13, 2017/04/18 18:41:46 version 1.13.10.1, 2018/04/07 04:11:48
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
 /* $OpenBSD: ssh-keysign.c,v 1.52 2016/02/15 09:47:49 dtucker Exp $ */  /* $OpenBSD: ssh-keysign.c,v 1.54 2018/02/23 15:58:38 markus Exp $ */
   
 /*  /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.   * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *   *
Line 152  valid_request(struct passwd *pw, char *h
Line 151  valid_request(struct passwd *pw, char *h
   
         debug3("%s: fail %d", __func__, fail);          debug3("%s: fail %d", __func__, fail);
   
         if (fail && key != NULL)          if (fail)
                 sshkey_free(key);                  sshkey_free(key);
         else if (ret != NULL)          else if (ret != NULL)
                 *ret = key;                  *ret = key;
Line 165  main(int argc, char **argv)
Line 164  main(int argc, char **argv)
 {  {
         struct sshbuf *b;          struct sshbuf *b;
         Options options;          Options options;
 #define NUM_KEYTYPES 4  #define NUM_KEYTYPES 5
         struct sshkey *keys[NUM_KEYTYPES], *key = NULL;          struct sshkey *keys[NUM_KEYTYPES], *key = NULL;
         struct passwd *pw;          struct passwd *pw;
         int r, key_fd[NUM_KEYTYPES], i, found, version = 2, fd;          int r, key_fd[NUM_KEYTYPES], i, found, version = 2, fd;
Line 191  main(int argc, char **argv)
Line 190  main(int argc, char **argv)
         key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY);          key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY);          key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY);          key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY);
           key_fd[i++] = open(_PATH_HOST_XMSS_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);          key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);
   
         original_real_uid = getuid();   /* XXX readconf.c needs this */          original_real_uid = getuid();   /* XXX readconf.c needs this */
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.13.10.1
CVSweb <webmaster@jp.NetBSD.org>