diff options
author | markus@openbsd.org <markus@openbsd.org> | 2019-11-12 19:33:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-13 08:54:09 +1100 |
commit | 2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch) | |
tree | 349cdc436823354aca60031358a6030313b6002d /sshkey.h | |
parent | fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff) |
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.37 2019/11/12 19:29:25 markus Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.38 2019/11/12 19:33:08 markus 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. |
@@ -129,7 +129,7 @@ struct sshkey { | |||
129 | /* KEY_ECDSA and KEY_ECDSA_SK */ | 129 | /* KEY_ECDSA and KEY_ECDSA_SK */ |
130 | int ecdsa_nid; /* NID of curve */ | 130 | int ecdsa_nid; /* NID of curve */ |
131 | EC_KEY *ecdsa; | 131 | EC_KEY *ecdsa; |
132 | /* KEY_ED25519 */ | 132 | /* KEY_ED25519 and KEY_ED25519_SK */ |
133 | u_char *ed25519_sk; | 133 | u_char *ed25519_sk; |
134 | u_char *ed25519_pk; | 134 | u_char *ed25519_pk; |
135 | /* KEY_XMSS */ | 135 | /* KEY_XMSS */ |
@@ -138,7 +138,7 @@ struct sshkey { | |||
138 | void *xmss_state; /* depends on xmss_name, opaque */ | 138 | void *xmss_state; /* depends on xmss_name, opaque */ |
139 | u_char *xmss_sk; | 139 | u_char *xmss_sk; |
140 | u_char *xmss_pk; | 140 | u_char *xmss_pk; |
141 | /* KEY_ECDSA_SK */ | 141 | /* KEY_ECDSA_SK and KEY_ED25519_SK */ |
142 | char *sk_application; | 142 | char *sk_application; |
143 | uint8_t sk_flags; | 143 | uint8_t sk_flags; |
144 | struct sshbuf *sk_key_handle; | 144 | struct sshbuf *sk_key_handle; |
@@ -180,6 +180,7 @@ int sshkey_unshield_private(struct sshkey *); | |||
180 | 180 | ||
181 | int sshkey_type_from_name(const char *); | 181 | int sshkey_type_from_name(const char *); |
182 | int sshkey_is_cert(const struct sshkey *); | 182 | int sshkey_is_cert(const struct sshkey *); |
183 | int sshkey_is_sk(const struct sshkey *); | ||
183 | int sshkey_type_is_cert(int); | 184 | int sshkey_type_is_cert(int); |
184 | int sshkey_type_plain(int); | 185 | int sshkey_type_plain(int); |
185 | int sshkey_to_certified(struct sshkey *); | 186 | int sshkey_to_certified(struct sshkey *); |