diff options
author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:18:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:32:50 +0000 |
commit | 0b372585c0026f78676f1414510ec9f87a383803 (patch) | |
tree | a3fa6b329a8a5e9841b526f30332d21fc110118a /key.h | |
parent | 24ffa45372888d206f21e1864e3911024c6d5e62 (diff) | |
parent | 6d0faf6dc76ac8cc73d6f8e478db7c97f7013a2d (diff) |
New upstream release (7.0p1).
Diffstat (limited to 'key.h')
-rw-r--r-- | key.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.h,v 1.47 2015/01/28 22:36:00 djm Exp $ */ | 1 | /* $OpenBSD: key.h,v 1.48 2015/07/03 03:43:18 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. |
@@ -51,7 +51,6 @@ typedef struct sshkey Key; | |||
51 | #define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid | 51 | #define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid |
52 | #define key_is_cert sshkey_is_cert | 52 | #define key_is_cert sshkey_is_cert |
53 | #define key_type_plain sshkey_type_plain | 53 | #define key_type_plain sshkey_type_plain |
54 | #define key_cert_is_legacy sshkey_cert_is_legacy | ||
55 | #define key_curve_name_to_nid sshkey_curve_name_to_nid | 54 | #define key_curve_name_to_nid sshkey_curve_name_to_nid |
56 | #define key_curve_nid_to_bits sshkey_curve_nid_to_bits | 55 | #define key_curve_nid_to_bits sshkey_curve_nid_to_bits |
57 | #define key_curve_nid_to_name sshkey_curve_nid_to_name | 56 | #define key_curve_nid_to_name sshkey_curve_nid_to_name |
@@ -69,7 +68,7 @@ int key_read(Key *, char **); | |||
69 | 68 | ||
70 | Key *key_generate(int, u_int); | 69 | Key *key_generate(int, u_int); |
71 | Key *key_from_private(const Key *); | 70 | Key *key_from_private(const Key *); |
72 | int key_to_certified(Key *, int); | 71 | int key_to_certified(Key *); |
73 | int key_drop_cert(Key *); | 72 | int key_drop_cert(Key *); |
74 | int key_certify(Key *, Key *); | 73 | int key_certify(Key *, Key *); |
75 | void key_cert_copy(const Key *, Key *); | 74 | void key_cert_copy(const Key *, Key *); |