- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / authfile.h

diff --git a/authfile.h b/authfile.h
index afec27d5433e2a848e9ed2afc70928703416029d..a6c74934d69ad1583a5eb73626cb7d0ecd4318cb 100644 (file)
--- a/authfile.h
+++ b/authfile.h
@@ -1,36 +1,26 @@
-#ifndef AUTHFILE_H
-#define AUTHFILE_H
+/* $OpenBSD: authfile.h,v 1.13 2006/04/25 08:02:27 dtucker Exp $ */
 
 /*
- * Saves the authentication (private) key in a file, encrypting it with
- * passphrase.
- * For RSA keys: The identification of the file (lowest 64 bits of n)
- * will precede the key to provide identification of the key without
- * needing a passphrase.
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * 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
+ * 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".
  */
-int
-save_private_key(const char *filename, const char *passphrase,
-    Key * private_key, const char *comment);
 
-/*
- * Loads the public part of the key file (public key and comment). Returns 0
- * if an error occurred; zero if the public key was successfully read.  The
- * 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);
+#ifndef AUTHFILE_H
+#define AUTHFILE_H
 
-/*
- * Loads the private key from the file.  Returns 0 if an error is encountered
- * (file does not exist or is not readable, or passphrase is bad). This
- * initializes the private key.  The comment of the key is returned in
- * comment_return if it is non-NULL; the caller must free the value with
- * xfree.
- */
-int
-load_private_key(const char *filename, const char *passphrase,
-    Key * private_key, char **comment_return);
+int     key_save_private(Key *, const char *, const char *, const char *);
+Key    *key_load_public(const char *, char **);
+Key    *key_load_public_type(int, const char *, char **);
+Key    *key_load_private(const char *, const char *, char **);
+Key    *key_load_private_type(int, const char *, const char *, char **, int *);
+Key    *key_load_private_pem(int, int, const char *, char **);
+int     key_perm_ok(int, const char *);
 
 #endif