===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.h,v
retrieving revision 1.5.2.6
retrieving revision 1.6
diff -u -r1.5.2.6 -r1.6
--- src/usr.bin/ssh/Attic/key.h	2002/03/08 17:04:42	1.5.2.6
+++ src/usr.bin/ssh/Attic/key.h	2000/11/12 19:50:37	1.6
@@ -1,7 +1,5 @@
-/*	$OpenBSD: key.h,v 1.5.2.6 2002/03/08 17:04:42 brad Exp $	*/
-
 /*
- * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,9 +24,6 @@
 #ifndef KEY_H
 #define KEY_H
 
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-
 typedef struct Key Key;
 enum types {
 	KEY_RSA1,
@@ -36,45 +31,40 @@
 	KEY_DSA,
 	KEY_UNSPEC
 };
-enum fp_type {
-	SSH_FP_SHA1,
-	SSH_FP_MD5
-};
-enum fp_rep {
-	SSH_FP_HEX,
-	SSH_FP_BUBBLEBABBLE
-};
-
-/* key is stored in external hardware */
-#define KEY_FLAG_EXT		0x0001
-
 struct Key {
-	int	 type;
-	int	 flags;
+	int	type;
 	RSA	*rsa;
 	DSA	*dsa;
 };
 
-Key	*key_new(int);
-Key	*key_new_private(int);
-void	 key_free(Key *);
-int	 key_equal(Key *, Key *);
-char	*key_fingerprint(Key *, enum fp_type, enum fp_rep);
-char	*key_type(Key *);
-int	 key_write(Key *, FILE *);
-int	 key_read(Key *, char **);
-u_int	 key_size(Key *);
+Key	*key_new(int type);
+Key	*key_new_private(int type);
+void	key_free(Key *k);
+int	key_equal(Key *a, Key *b);
+char	*key_fingerprint(Key *k);
+char	*key_type(Key *k);
+int	key_write(Key *key, FILE *f);
+int	key_read(Key *key, char **cpp);
+u_int	key_size(Key *k);
 
-Key	*key_generate(int, u_int);
-Key	*key_from_private(Key *);
-int	 key_type_from_name(char *);
+Key	*key_generate(int type, unsigned int bits);
+Key	*key_from_private(Key *k);
+int	key_type_from_name(char *name);
 
-Key	*key_from_blob(u_char *, int);
-int	 key_to_blob(Key *, u_char **, u_int *);
-char	*key_ssh_name(Key *);
-int	 key_names_valid2(const char *);
+Key	*key_from_blob(char *blob, int blen);
+int	key_to_blob(Key *key, unsigned char **blobp, unsigned int *lenp);
+char	*key_ssh_name(Key *k);
 
-int	 key_sign(Key *, u_char **, u_int *, u_char *, u_int);
-int	 key_verify(Key *, u_char *, u_int, u_char *, u_int);
+int
+key_sign(
+    Key *key,
+    unsigned char **sigp, int *lenp,
+    unsigned char *data, int datalen);
+
+int
+key_verify(
+    Key *key,
+    unsigned char *signature, int signaturelen,
+    unsigned char *data, int datalen);
 
 #endif