diff options
author | djm <djm> | 2000-09-16 02:29:08 +0000 |
---|---|---|
committer | djm <djm> | 2000-09-16 02:29:08 +0000 |
commit | 5dcef222e47244e4c607adb2a21d07d96e82ee42 (patch) | |
tree | 2a4805acbcb8fe9fde321a4eddbaacde140d19b3 /authfile.h | |
parent | 70a40307e9c40a6397fce29f768b253809b3d503 (diff) | |
download | openssh-5dcef222e47244e4c607adb2a21d07d96e82ee42.tar.gz |
- (djm) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/09/05 02:59:57
[session.c]
print hostname (not hushlogin)
- markus@cvs.openbsd.org 2000/09/05 13:18:48
[authfile.c ssh-add.c]
enable ssh-add -d for DSA keys
- markus@cvs.openbsd.org 2000/09/05 13:20:49
[sftp-server.c]
cleanup
- markus@cvs.openbsd.org 2000/09/06 03:46:41
[authfile.h]
prototype
- deraadt@cvs.openbsd.org 2000/09/07 14:27:56
[ALL]
cleanup copyright notices on all files. I have attempted to be
accurate with the details. everything is now under Tatu's licence
(which I copied from his readme), and/or the core-sdi bsd-ish thing
for deattack, or various openbsd developers under a 2-term bsd
licence. We're not changing any rules, just being accurate.
- markus@cvs.openbsd.org 2000/09/07 14:40:30
[channels.c channels.h clientloop.c serverloop.c ssh.c]
cleanup window and packet sizes for ssh2 flow control; ok niels
- markus@cvs.openbsd.org 2000/09/07 14:53:00
[scp.c]
typo
- markus@cvs.openbsd.org 2000/09/07 15:13:37
[auth-options.c auth-options.h auth-rh-rsa.c auth-rsa.c auth.c]
[authfile.h canohost.c channels.h compat.c hostfile.h log.c match.h]
[pty.c readconf.c]
some more Copyright fixes
- markus@cvs.openbsd.org 2000/09/08 03:02:51
[README.openssh2]
bye bye
- deraadt@cvs.openbsd.org 2000/09/11 18:38:33
[LICENCE cipher.c]
a few more comments about it being ARC4 not RC4
- markus@cvs.openbsd.org 2000/09/12 14:53:11
[log-client.c log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c]
multiple debug levels
- markus@cvs.openbsd.org 2000/09/14 14:25:15
[clientloop.c]
typo
- deraadt@cvs.openbsd.org 2000/09/15 01:13:51
[ssh-agent.c]
check return value for setenv(3) for failure, and deal appropriately
Diffstat (limited to 'authfile.h')
-rw-r--r-- | authfile.h | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,15 @@ +/* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland + * All rights reserved + * Functions to interface with the SSH_AUTHENTICATION_FD socket. + * + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". + */ #ifndef AUTHFILE_H #define AUTHFILE_H @@ -18,9 +30,8 @@ save_private_key(const char *filename, const char *passphrase, * comment of the key is returned in comment_return if it is non-NULL; the * caller must free the value with xfree. */ -int -load_public_key(const char *filename, Key * pub, - char **comment_return); +int load_public_key(const char *filename, Key * pub, char **comment_return); +int try_load_public_key(const char *filename, Key * pub, char **comment_return); /* * Loads the private key from the file. Returns 0 if an error is encountered |