[BACK]Return to authfile.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/authfile.c between version 1.99 and 1.100

version 1.99, 2013/12/06 13:34:54 version 1.100, 2013/12/06 13:39:49
Line 46 
Line 46 
 #include <openssl/evp.h>  #include <openssl/evp.h>
 #include <openssl/pem.h>  #include <openssl/pem.h>
   
   #include "crypto_api.h"
   
 #include <errno.h>  #include <errno.h>
 #include <fcntl.h>  #include <fcntl.h>
 #include <stdio.h>  #include <stdio.h>
Line 582 
Line 584 
                             comment, new_format_cipher, new_format_rounds);                              comment, new_format_cipher, new_format_rounds);
                 }                  }
                 return key_private_pem_to_blob(key, blob, passphrase, comment);                  return key_private_pem_to_blob(key, blob, passphrase, comment);
           case KEY_ED25519:
                   return key_private_to_blob2(key, blob, passphrase,
                       comment, new_format_cipher, new_format_rounds);
         default:          default:
                 error("%s: cannot save key type %d", __func__, key->type);                  error("%s: cannot save key type %d", __func__, key->type);
                 return 0;                  return 0;
Line 981 
Line 986 
         case KEY_DSA:          case KEY_DSA:
         case KEY_ECDSA:          case KEY_ECDSA:
         case KEY_RSA:          case KEY_RSA:
                   return key_parse_private_pem(blob, type, passphrase, commentp);
           case KEY_ED25519:
                   return key_parse_private2(blob, type, passphrase, commentp);
         case KEY_UNSPEC:          case KEY_UNSPEC:
                 if ((k = key_parse_private2(blob, type, passphrase, commentp)))                  if ((k = key_parse_private2(blob, type, passphrase, commentp)))
                         return k;                          return k;
Legend:
Removed from v.1.99  
changed lines
  Added in v.1.100