summaryrefslogtreecommitdiff
path: root/key.h
diff options
context:
space:
mode:
Diffstat (limited to 'key.h')
-rw-r--r--key.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/key.h b/key.h
index c6401a576..89fd5cfdf 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.h,v 1.42 2014/06/24 01:13:21 djm Exp $ */ 1/* $OpenBSD: key.h,v 1.47 2015/01/28 22:36:00 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -39,7 +39,6 @@ typedef struct sshkey Key;
39#define key_free sshkey_free 39#define key_free sshkey_free
40#define key_equal_public sshkey_equal_public 40#define key_equal_public sshkey_equal_public
41#define key_equal sshkey_equal 41#define key_equal sshkey_equal
42#define key_fingerprint sshkey_fingerprint
43#define key_type sshkey_type 42#define key_type sshkey_type
44#define key_cert_type sshkey_cert_type 43#define key_cert_type sshkey_cert_type
45#define key_ssh_name sshkey_ssh_name 44#define key_ssh_name sshkey_ssh_name
@@ -50,7 +49,6 @@ typedef struct sshkey Key;
50#define key_size sshkey_size 49#define key_size sshkey_size
51#define key_ecdsa_bits_to_nid sshkey_ecdsa_bits_to_nid 50#define key_ecdsa_bits_to_nid sshkey_ecdsa_bits_to_nid
52#define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid 51#define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid
53#define key_names_valid2 sshkey_names_valid2
54#define key_is_cert sshkey_is_cert 52#define key_is_cert sshkey_is_cert
55#define key_type_plain sshkey_type_plain 53#define key_type_plain sshkey_type_plain
56#define key_cert_is_legacy sshkey_cert_is_legacy 54#define key_cert_is_legacy sshkey_cert_is_legacy
@@ -60,14 +58,12 @@ typedef struct sshkey Key;
60#define key_ec_nid_to_hash_alg sshkey_ec_nid_to_hash_alg 58#define key_ec_nid_to_hash_alg sshkey_ec_nid_to_hash_alg
61#define key_dump_ec_point sshkey_dump_ec_point 59#define key_dump_ec_point sshkey_dump_ec_point
62#define key_dump_ec_key sshkey_dump_ec_key 60#define key_dump_ec_key sshkey_dump_ec_key
63#define key_fingerprint sshkey_fingerprint
64#endif 61#endif
65 62
66void key_add_private(Key *); 63void key_add_private(Key *);
67Key *key_new_private(int); 64Key *key_new_private(int);
68void key_free(Key *); 65void key_free(Key *);
69Key *key_demote(const Key *); 66Key *key_demote(const Key *);
70u_char *key_fingerprint_raw(const Key *, enum fp_type, u_int *);
71int key_write(const Key *, FILE *); 67int key_write(const Key *, FILE *);
72int key_read(Key *, char **); 68int key_read(Key *, char **);
73 69
@@ -104,8 +100,6 @@ Key *key_load_public(const char *, char **);
104Key *key_load_private(const char *, const char *, char **); 100Key *key_load_private(const char *, const char *, char **);
105Key *key_load_private_cert(int, const char *, const char *, int *); 101Key *key_load_private_cert(int, const char *, const char *, int *);
106Key *key_load_private_type(int, const char *, const char *, char **, int *); 102Key *key_load_private_type(int, const char *, const char *, char **, int *);
107Key *key_load_private_pem(int, int, const char *, char **);
108int key_perm_ok(int, const char *); 103int key_perm_ok(int, const char *);
109int key_in_file(Key *, const char *, int);
110 104
111#endif 105#endif