diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2019-11-12 20:33:08 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-12 22:54:09 +0100 |
| commit | 2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch) | |
| tree | 349cdc436823354aca60031358a6030313b6002d /sshkey.h | |
| parent | upstream: update sk-api to version 2 for ed25519 support; ok djm (diff) | |
| download | openssh-2c55744a56de0ffc81fe445a1e7fc5cd308712b3.tar.xz openssh-2c55744a56de0ffc81fe445a1e7fc5cd308712b3.zip | |
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 @@ -/* $OpenBSD: sshkey.h,v 1.37 2019/11/12 19:29:25 markus Exp $ */ +/* $OpenBSD: sshkey.h,v 1.38 2019/11/12 19:33:08 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -129,7 +129,7 @@ struct sshkey { /* KEY_ECDSA and KEY_ECDSA_SK */ int ecdsa_nid; /* NID of curve */ EC_KEY *ecdsa; - /* KEY_ED25519 */ + /* KEY_ED25519 and KEY_ED25519_SK */ u_char *ed25519_sk; u_char *ed25519_pk; /* KEY_XMSS */ @@ -138,7 +138,7 @@ struct sshkey { void *xmss_state; /* depends on xmss_name, opaque */ u_char *xmss_sk; u_char *xmss_pk; - /* KEY_ECDSA_SK */ + /* KEY_ECDSA_SK and KEY_ED25519_SK */ char *sk_application; uint8_t sk_flags; struct sshbuf *sk_key_handle; @@ -180,6 +180,7 @@ int sshkey_unshield_private(struct sshkey *); int sshkey_type_from_name(const char *); int sshkey_is_cert(const struct sshkey *); +int sshkey_is_sk(const struct sshkey *); int sshkey_type_is_cert(int); int sshkey_type_plain(int); int sshkey_to_certified(struct sshkey *); |