src/usr.bin/ssh/authfile.h - diff

Return to authfile.h CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/authfile.h between version 1.17 and 1.18

-version 1.17, 2013/12/06 13:34:54
+version 1.18, 2014/06/24 01:13:21
 Line 1
 Line 1
 Line 1
  /* $OpenBSD$ */
  /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-  *                    All rights reserved
   *
-  * As far as I am concerned, the code I have written for this software
+  * Redistribution and use in source and binary forms, with or without
-  * can be used freely for any purpose.  Any derived versions of this
+  * modification, are permitted provided that the following conditions
-  * software must be clearly marked as such, and if the derived work is
+  * are met:
-  * incompatible with the protocol description in the RFC file, it must be
+  * 1. Redistributions of source code must retain the above copyright
-  * called by a name other than "ssh" or "Secure Shell".
+  *    notice, this list of conditions and the following disclaimer.
+  * 2. Redistributions in binary form must reproduce the above copyright
+  *    notice, this list of conditions and the following disclaimer in the
+  *    documentation and/or other materials provided with the distribution.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  #ifndef AUTHFILE_H
  #define AUTHFILE_H
- int      key_save_private(Key *, const char *, const char *, const char *,
+ #ifdef WITH_LEAKMALLOC
-     int, const char *, int);
+ #include "leakmalloc.h"
- int      key_load_file(int, const char *, Buffer *);
+ #endif
- Key     *key_load_cert(const char *);
- Key     *key_load_public(const char *, char **);
+ struct sshbuf;
- Key     *key_load_public_type(int, const char *, char **);
+ struct sshkey;
- Key     *key_parse_private(Buffer *, const char *, const char *, char **);
- Key     *key_load_private(const char *, const char *, char **);
+ int sshkey_save_private(struct sshkey *, const char *,
- Key     *key_load_private_cert(int, const char *, const char *, int *);
+     const char *, const char *, int, const char *, int);
- Key     *key_load_private_type(int, const char *, const char *, char **, int *);
+ int sshkey_load_file(int, const char *, struct sshbuf *);
- Key     *key_load_private_pem(int, int, const char *, char **);
+ int sshkey_load_cert(const char *, struct sshkey **);
- int      key_perm_ok(int, const char *);
+ int sshkey_load_public(const char *, struct sshkey **, char **);
- int      key_in_file(Key *, const char *, int);
+ int sshkey_load_private(const char *, const char *, struct sshkey **, char **);
+ int sshkey_load_private_cert(int, const char *, const char *,
+     struct sshkey **, int *);
+ int sshkey_load_private_type(int, const char *, const char *,
+     struct sshkey **, char **, int *);
+ int sshkey_load_private_pem(int, int, const char *, struct sshkey **, char **);
+ int sshkey_perm_ok(int, const char *);
+ int sshkey_in_file(struct sshkey *, const char *, int);
  #endif