summaryrefslogtreecommitdiff
path: root/key.h
diff options
context:
space:
mode:
Diffstat (limited to 'key.h')
-rw-r--r--key.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/key.h b/key.h
index 69254cf12..810f2aaae 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.h,v 1.29 2010/03/15 19:40:02 stevesk Exp $ */ 1/* $OpenBSD: key.h,v 1.30 2010/04/16 01:47:26 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.
@@ -37,6 +37,8 @@ enum types {
37 KEY_DSA, 37 KEY_DSA,
38 KEY_RSA_CERT, 38 KEY_RSA_CERT,
39 KEY_DSA_CERT, 39 KEY_DSA_CERT,
40 KEY_RSA_CERT_V00,
41 KEY_DSA_CERT_V00,
40 KEY_NULL, 42 KEY_NULL,
41 KEY_UNSPEC 43 KEY_UNSPEC
42}; 44};
@@ -57,11 +59,13 @@ enum fp_rep {
57struct KeyCert { 59struct KeyCert {
58 Buffer certblob; /* Kept around for use on wire */ 60 Buffer certblob; /* Kept around for use on wire */
59 u_int type; /* SSH2_CERT_TYPE_USER or SSH2_CERT_TYPE_HOST */ 61 u_int type; /* SSH2_CERT_TYPE_USER or SSH2_CERT_TYPE_HOST */
62 u_int64_t serial;
60 char *key_id; 63 char *key_id;
61 u_int nprincipals; 64 u_int nprincipals;
62 char **principals; 65 char **principals;
63 u_int64_t valid_after, valid_before; 66 u_int64_t valid_after, valid_before;
64 Buffer constraints; 67 Buffer critical;
68 Buffer extensions;
65 Key *signature_key; 69 Key *signature_key;
66}; 70};
67 71
@@ -93,12 +97,13 @@ Key *key_from_private(const Key *);
93int key_type_from_name(char *); 97int key_type_from_name(char *);
94int key_is_cert(const Key *); 98int key_is_cert(const Key *);
95int key_type_plain(int); 99int key_type_plain(int);
96int key_to_certified(Key *); 100int key_to_certified(Key *, int);
97int key_drop_cert(Key *); 101int key_drop_cert(Key *);
98int key_certify(Key *, Key *); 102int key_certify(Key *, Key *);
99void key_cert_copy(const Key *, struct Key *); 103void key_cert_copy(const Key *, struct Key *);
100int key_cert_check_authority(const Key *, int, int, const char *, 104int key_cert_check_authority(const Key *, int, int, const char *,
101 const char **); 105 const char **);
106int key_cert_is_legacy(Key *);
102 107
103Key *key_from_blob(const u_char *, u_int); 108Key *key_from_blob(const u_char *, u_int);
104int key_to_blob(const Key *, u_char **, u_int *); 109int key_to_blob(const Key *, u_char **, u_int *);