summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-25 05:01:22 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-25 05:01:22 +0000
commitbba81213b972ce15fbbaca60b9ffabb42371ce8f (patch)
treee6bd40752969f2b93d179cfb9aaae9074ca45956 /authfile.c
parent34f91883a6f3123656b0a8017d68b658f7cf2403 (diff)
- itojun@cvs.openbsd.org 2001/06/23 15:12:20
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c canohost.c channels.c cipher.c clientloop.c deattack.c dh.c hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c readpass.c scp.c servconf.c serverloop.c session.c sftp.c sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c ssh-keygen.c ssh-keyscan.c] more strict prototypes. raise warning level in Makefile.inc. markus ok'ed TODO; cleanup headers
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/authfile.c b/authfile.c
index c4da9aad3..b4b985c95 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: authfile.c,v 1.36 2001/06/07 20:23:03 markus Exp $"); 39RCSID("$OpenBSD: authfile.c,v 1.37 2001/06/23 15:12:17 itojun Exp $");
40 40
41#include <openssl/err.h> 41#include <openssl/err.h>
42#include <openssl/evp.h> 42#include <openssl/evp.h>
@@ -62,7 +62,7 @@ static const char authfile_id_string[] =
62 * passphrase. 62 * passphrase.
63 */ 63 */
64 64
65int 65static int
66key_save_private_rsa1(Key *key, const char *filename, const char *passphrase, 66key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
67 const char *comment) 67 const char *comment)
68{ 68{
@@ -159,7 +159,7 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
159} 159}
160 160
161/* save SSH v2 key in OpenSSL PEM format */ 161/* save SSH v2 key in OpenSSL PEM format */
162int 162static int
163key_save_private_pem(Key *key, const char *filename, const char *_passphrase, 163key_save_private_pem(Key *key, const char *filename, const char *_passphrase,
164 const char *comment) 164 const char *comment)
165{ 165{
@@ -226,7 +226,7 @@ key_save_private(Key *key, const char *filename, const char *passphrase,
226 * otherwise. 226 * otherwise.
227 */ 227 */
228 228
229Key * 229static Key *
230key_load_public_rsa1(int fd, const char *filename, char **commentp) 230key_load_public_rsa1(int fd, const char *filename, char **commentp)
231{ 231{
232 Buffer buffer; 232 Buffer buffer;
@@ -306,7 +306,7 @@ key_load_public_type(int type, const char *filename, char **commentp)
306 * Assumes we are called under uid of the owner of the file. 306 * Assumes we are called under uid of the owner of the file.
307 */ 307 */
308 308
309Key * 309static Key *
310key_load_private_rsa1(int fd, const char *filename, const char *passphrase, 310key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
311 char **commentp) 311 char **commentp)
312{ 312{
@@ -430,7 +430,7 @@ fail:
430 return NULL; 430 return NULL;
431} 431}
432 432
433Key * 433static Key *
434key_load_private_pem(int fd, int type, const char *passphrase, 434key_load_private_pem(int fd, int type, const char *passphrase,
435 char **commentp) 435 char **commentp)
436{ 436{
@@ -481,7 +481,7 @@ key_load_private_pem(int fd, int type, const char *passphrase,
481 return prv; 481 return prv;
482} 482}
483 483
484int 484static int
485key_perm_ok(int fd, const char *filename) 485key_perm_ok(int fd, const char *filename)
486{ 486{
487 struct stat st; 487 struct stat st;
@@ -571,7 +571,7 @@ key_load_private(const char *filename, const char *passphrase,
571 return prv; 571 return prv;
572} 572}
573 573
574int 574static int
575key_try_load_public(Key *k, const char *filename, char **commentp) 575key_try_load_public(Key *k, const char *filename, char **commentp)
576{ 576{
577 FILE *f; 577 FILE *f;