diff options
author | markus@openbsd.org <markus@openbsd.org> | 2019-11-13 07:53:10 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-15 08:50:10 +1100 |
commit | bf219920b70cafbf29ebc9890ef67d0efa54e738 (patch) | |
tree | 58f360f1387c7238a4bc1f8c63cdc5ccbfb88dd5 /sshkey.h | |
parent | 40598b85d72a509566b7b2a6d57676c7231fed34 (diff) |
upstream: fix shield/unshield for xmss keys: - in ssh-agent we need
to delay the call to shield until we have received key specific options. -
when serializing xmss keys for shield we need to deal with all optional
components (e.g. state might not be loaded). ok djm@
OpenBSD-Commit-ID: cc2db82524b209468eb176d6b4d6b9486422f41f
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.38 2019/11/12 19:33:08 markus Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.39 2019/11/13 07:53:10 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. |
@@ -87,9 +87,10 @@ enum sshkey_fp_rep { | |||
87 | /* Private key serialisation formats, used on the wire */ | 87 | /* Private key serialisation formats, used on the wire */ |
88 | enum sshkey_serialize_rep { | 88 | enum sshkey_serialize_rep { |
89 | SSHKEY_SERIALIZE_DEFAULT = 0, | 89 | SSHKEY_SERIALIZE_DEFAULT = 0, |
90 | SSHKEY_SERIALIZE_STATE = 1, | 90 | SSHKEY_SERIALIZE_STATE = 1, /* only state is serialized */ |
91 | SSHKEY_SERIALIZE_FULL = 2, | 91 | SSHKEY_SERIALIZE_FULL = 2, /* include keys for saving to disk */ |
92 | SSHKEY_SERIALIZE_INFO = 254, | 92 | SSHKEY_SERIALIZE_SHIELD = 3, /* everything, for encrypting in ram */ |
93 | SSHKEY_SERIALIZE_INFO = 254, /* minimal information */ | ||
93 | }; | 94 | }; |
94 | 95 | ||
95 | /* Private key disk formats */ | 96 | /* Private key disk formats */ |