| sshconnect2.c (1.177) | sshconnect2.c (1.178) |
|---|---|
| 1/* $OpenBSD: sshconnect2.c,v 1.177 2010/01/04 01:45:30 dtucker Exp $ */ | 1/* $OpenBSD: sshconnect2.c,v 1.178 2010/01/11 04:46:45 dtucker Exp $ */ |
| 2/* 3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 1. Redistributions of source code must retain the above copyright --- 1229 unchanged lines hidden (view full) --- 1239 return 1; 1240} 1241 1242static Key * 1243load_identity_file(char *filename) 1244{ 1245 Key *private; 1246 char prompt[300], *passphrase; | 2/* 3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 1. Redistributions of source code must retain the above copyright --- 1229 unchanged lines hidden (view full) --- 1239 return 1; 1240} 1241 1242static Key * 1243load_identity_file(char *filename) 1244{ 1245 Key *private; 1246 char prompt[300], *passphrase; |
| 1247 int perm_ok, quit, i; | 1247 int perm_ok = 0, quit, i; |
| 1248 struct stat st; 1249 1250 if (stat(filename, &st) < 0) { 1251 debug3("no such identity: %s", filename); 1252 return NULL; 1253 } 1254 private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok); 1255 if (!perm_ok) --- 597 unchanged lines hidden --- | 1248 struct stat st; 1249 1250 if (stat(filename, &st) < 0) { 1251 debug3("no such identity: %s", filename); 1252 return NULL; 1253 } 1254 private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok); 1255 if (!perm_ok) --- 597 unchanged lines hidden --- |