--- 1/draft-ietf-netconf-netconf-client-server-17.txt 2020-03-08 14:13:29.194576269 -0700 +++ 2/draft-ietf-netconf-netconf-client-server-18.txt 2020-03-08 14:13:29.406581653 -0700 @@ -1,18 +1,18 @@ NETCONF Working Group K. Watsen Internet-Draft Watsen Networks -Intended status: Standards Track November 20, 2019 -Expires: May 23, 2020 +Intended status: Standards Track March 8, 2020 +Expires: September 9, 2020 NETCONF Client and Server Models - draft-ietf-netconf-netconf-client-server-17 + draft-ietf-netconf-netconf-client-server-18 Abstract This document defines two YANG modules, one module to configure a NETCONF client and the other module to configure a NETCONF server. Both modules support both the SSH and TLS transport protocols, and support both standard NETCONF and NETCONF Call Home connections. Editorial Note (To be removed by RFC Editor) @@ -44,100 +44,101 @@ o "YYYY" --> the assigned RFC value for I-D.ietf-netconf-ssh-client- server o "ZZZZ" --> the assigned RFC value for I-D.ietf-netconf-tls-client- server Artwork in this document contains placeholder values for the date of publication of this draft. Please apply the following replacement: - o "2019-11-20" --> the publication date of this draft + o "2020-03-08" --> the publication date of this draft The following Appendix section is to be removed prior to publication: o Appendix B. Change Log Status of This Memo This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79. Internet-Drafts are working documents of the Internet Engineering Task Force (IETF). Note that other groups may also distribute working documents as Internet-Drafts. The list of current Internet- Drafts is at https://datatracker.ietf.org/drafts/current/. Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on May 23, 2020. + This Internet-Draft will expire on September 9, 2020. Copyright Notice - Copyright (c) 2019 IETF Trust and the persons identified as the + Copyright (c) 2020 IETF Trust and the persons identified as the document authors. All rights reserved. This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License. Table of Contents - 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 3 + 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 4 2. Terminology . . . . . . . . . . . . . . . . . . . . . . . . . 4 3. The NETCONF Client Model . . . . . . . . . . . . . . . . . . 4 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 6 3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9 4. The NETCONF Server Model . . . . . . . . . . . . . . . . . . 20 4.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 20 4.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 22 4.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 29 5. Security Considerations . . . . . . . . . . . . . . . . . . . 41 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 42 6.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 42 6.2. The YANG Module Names Registry . . . . . . . . . . . . . 42 - 7. References . . . . . . . . . . . . . . . . . . . . . . . . . 42 + 7. References . . . . . . . . . . . . . . . . . . . . . . . . . 43 7.1. Normative References . . . . . . . . . . . . . . . . . . 43 7.2. Informative References . . . . . . . . . . . . . . . . . 44 Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 45 A.1. Expanded Tree Diagram for 'ietf-netconf-client' . . . . . 45 - A.2. Expanded Tree Diagram for 'ietf-netconf-server' . . . . . 66 - Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 89 - B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 89 - B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 89 - B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 89 - B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 89 - B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 90 - B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 90 - B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 90 - B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 90 - B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 90 - B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 91 - B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 91 - B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 91 - B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 92 - B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 92 - B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 92 - B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 92 - B.17. 16 to 17 . . . . . . . . . . . . . . . . . . . . . . . . 92 - Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 92 - Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 93 + A.2. Expanded Tree Diagram for 'ietf-netconf-server' . . . . . 69 + Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 94 + B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 94 + B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 94 + B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 94 + B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 94 + B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 95 + B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 95 + B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 95 + B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 95 + B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 95 + B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 96 + B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 96 + B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 96 + B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 97 + B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 97 + B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 97 + B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 97 + B.17. 16 to 17 . . . . . . . . . . . . . . . . . . . . . . . . 97 + B.18. 17 to 18 . . . . . . . . . . . . . . . . . . . . . . . . 97 + Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 97 + Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 98 1. Introduction This document defines two YANG [RFC7950] modules, one module to configure a NETCONF [RFC6241] client and the other module to configure a NETCONF server. Both modules support both NETCONF over SSH [RFC6242] and NETCONF over TLS [RFC7589] and NETCONF Call Home connections [RFC8071]. 2. Terminology @@ -277,26 +278,26 @@ lic-key-format> base64encodedvalue== ct:rsa-private-key-format base64encodedvalue== - explicitly-trusted-server-ca\ - -certs + trusted-server-ca-certs - explicitly-trusted-server-ce\ - rts + trusted-server-ee-certs 30 3 @@ -323,26 +324,26 @@ base64encodedvalue== ct:rsa-private-key-format base64encodedvalue== base64encodedvalue== - explicitly-trusted-server-ca\ - -certs + trusted-server-ca-certs - explicitly-trusted-server-ce\ - rts + trusted-server-ee-certs 30 3 @@ -371,55 +372,54 @@ foobar rsa2048 ct:ssh-public-key-format base64encodedvalue== ct:rsa-private-key-format base64encodedvalue== - - explicitly-trusted-server-ca-cer\ - ts + trusted-server-ca-certs - explicitly-trusted-server-certs<\ - /truststore-reference> + trusted-server-ee-certs - explicitly-trusted-ssh-host-keys\ - + trusted-ssh-public-keys 3.3. YANG Module This YANG module has normative references to [RFC6242], [RFC6991], [RFC7589], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], [I-D.ietf-netconf-ssh-client-server], and [I-D.ietf-netconf-tls-client-server]. - file "ietf-netconf-client@2019-11-20.yang" + file "ietf-netconf-client@2020-03-08.yang" module ietf-netconf-client { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-client"; prefix ncc; import ietf-yang-types { prefix yang; reference "RFC 6991: Common YANG Data Types"; @@ -432,28 +432,28 @@ } import ietf-tcp-server { prefix tcps; reference "RFC BBBB: YANG Groupings for TCP Clients and TCP Servers"; } import ietf-ssh-client { prefix sshc; - revision-date 2019-11-20; // stable grouping definitions + revision-date 2020-03-08; // stable grouping definitions reference "RFC CCCC: YANG Groupings for SSH Clients and SSH Servers"; } import ietf-tls-client { prefix tlsc; - revision-date 2019-11-20; // stable grouping definitions + revision-date 2020-03-08; // stable grouping definitions reference "RFC DDDD: YANG Groupings for TLS Clients and TLS Servers"; } organization "IETF NETCONF (Network Configuration) Working Group"; contact "WG Web: WG List: @@ -478,21 +478,21 @@ (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself for full legal notices.; The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document are to be interpreted as described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2019-11-20 { + revision 2020-03-08 { description "Initial version"; reference "RFC XXXX: NETCONF Client and Server Models"; } // Features feature ssh-initiate { description @@ -558,21 +559,21 @@ container tcp-client-parameters { description "A wrapper around the TCP client parameters to avoid name collisions."; uses tcpc:tcp-client-grouping { refine "remote-port" { default "830"; description "The NETCONF client will attempt to connect to the IANA-assigned well-known port value - for 'netconf-ssh' (443) if no value is + for 'netconf-ssh' (830) if no value is specified."; } } } container ssh-client-parameters { description "A wrapper around the SSH client parameters to avoid name collisions."; uses sshc:ssh-client-grouping; } @@ -1088,29 +1091,30 @@ rsa2048 ct:subject-public-key-info-format\ base64encodedvalue== ct:rsa-private-key-format base64encodedvalue== base64encodedvalue== + - explicitly-trusted-client-ca-cer\ - ts + trusted-client-ca-certs - explicitly-trusted-client-certs<\ - /truststore-reference> + trusted-client-ee-certs 1 11:0A:05:11:00 x509c2n:specified scooby-doo @@ -1233,31 +1236,32 @@ rsa2048 ct:subject-public-key-info-fo\ rmat base64encodedvalue== ct:rsa-private-key-format base64encodedvalue== base64encodedvalue== + - explicitly-trusted-client-ca\ - -certs + trusted-client-ca-certs - explicitly-trusted-client-ce\ - rts + trusted-client-ee-certs 30 3 @@ -1296,26 +1300,26 @@ base64encodedvalue== ct:rsa-private-key-format base64encodedvalue== base64encodedvalue== - explicitly-trusted-client-ca\ - -certs + trusted-client-ca-certs - explicitly-trusted-client-ce\ - rts + trusted-client-ee-certs 30 3 @@ -1346,21 +1349,21 @@ 4.3. YANG Module This YANG module has normative references to [RFC6242], [RFC6991], [RFC7407], [RFC7589], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], [I-D.ietf-netconf-ssh-client-server], and [I-D.ietf-netconf-tls-client-server]. - file "ietf-netconf-server@2019-11-20.yang" + file "ietf-netconf-server@2020-03-08.yang" module ietf-netconf-server { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-server"; prefix ncs; import ietf-yang-types { prefix yang; reference "RFC 6991: Common YANG Data Types"; @@ -1379,34 +1382,35 @@ } import ietf-tcp-server { prefix tcps; reference "RFC BBBB: YANG Groupings for TCP Clients and TCP Servers"; } import ietf-ssh-common { prefix sshcmn; - revision-date 2019-11-20; // stable grouping definitions + revision-date 2020-03-08; // stable grouping definitions reference "RFC CCCC: YANG Groupings for SSH Clients and SSH Servers"; } + import ietf-ssh-server { prefix sshs; - revision-date 2019-11-20; // stable grouping definitions + revision-date 2020-03-08; // stable grouping definitions reference "RFC CCCC: YANG Groupings for SSH Clients and SSH Servers"; } import ietf-tls-server { prefix tlss; - revision-date 2019-11-20; // stable grouping definitions + revision-date 2020-03-08; // stable grouping definitions reference "RFC DDDD: YANG Groupings for TLS Clients and TLS Servers"; } organization "IETF NETCONF (Network Configuration) Working Group"; contact "WG Web: WG List: @@ -1425,29 +1429,28 @@ Redistribution and use in source and binary forms, with or without modification, is permitted pursuant to, and subject to the license terms contained in, the Simplified BSD License set forth in Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info). This version of this YANG module is part of RFC XXXX (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself for full legal notices.; - The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document are to be interpreted as described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2019-11-20 { + revision 2020-03-08 { description "Initial version"; reference "RFC XXXX: NETCONF Client and Server Models"; } // Features feature ssh-listen { description @@ -1593,30 +1596,28 @@ IANA-assigned well-known port value for 'netconf-tls' (6513) if no value is specified."; } } } container tls-server-parameters { description "A wrapper around the TLS server parameters to avoid name collisions."; - uses tlss:tls-server-grouping; /* { - FIXME: commented out since auth could also be external. - ^-- need a better 'must' expression? + uses tlss:tls-server-grouping { refine "client-authentication" { must 'ca-certs or client-certs'; description "NETCONF/TLS servers MUST validate client certificates."; } - }*/ + } } container netconf-server-parameters { description "A wrapper around the NETCONF server parameters to avoid name collisions."; uses ncs:netconf-server-grouping; } } } } @@ -2004,36 +2007,37 @@ namespace: urn:ietf:params:xml:ns:yang:ietf-netconf-client prefix: ncc reference: RFC XXXX name: ietf-netconf-server namespace: urn:ietf:params:xml:ns:yang:ietf-netconf-server prefix: ncs reference: RFC XXXX 7. References + 7.1. Normative References [I-D.ietf-netconf-keystore] Watsen, K., "A YANG Data Model for a Keystore", draft- - ietf-netconf-keystore-14 (work in progress), November + ietf-netconf-keystore-15 (work in progress), November 2019. [I-D.ietf-netconf-ssh-client-server] Watsen, K., Wu, G., and L. Xia, "YANG Groupings for SSH Clients and SSH Servers", draft-ietf-netconf-ssh-client- - server-16 (work in progress), November 2019. + server-17 (work in progress), November 2019. [I-D.ietf-netconf-tls-client-server] Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS Clients and TLS Servers", draft-ietf-netconf-tls-client- - server-16 (work in progress), November 2019. + server-17 (work in progress), November 2019. [I-D.kwatsen-netconf-tcp-client-server] Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients and TCP Servers", draft-kwatsen-netconf-tcp-client- server-02 (work in progress), April 2019. [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, . @@ -2070,23 +2074,23 @@ RFC 7950, DOI 10.17487/RFC7950, August 2016, . [RFC8174] Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017, . 7.2. Informative References [I-D.ietf-netconf-trust-anchors] - Watsen, K. and H. Birkholz, "A YANG Data Model for a - Truststore", draft-ietf-netconf-trust-anchors-07 (work in - progress), November 2019. + Watsen, K., "A YANG Data Model for a Truststore", draft- + ietf-netconf-trust-anchors-08 (work in progress), November + 2019. [RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688, DOI 10.17487/RFC3688, January 2004, . [RFC8040] Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017, . [RFC8071] Watsen, K., "NETCONF Call Home and RESTCONF Call Home", @@ -2137,34 +2141,32 @@ | | | | | {local-binding-supported}? | | | | +--rw keepalives! | | | | {keepalives-supported}? | | | | +--rw idle-time uint16 | | | | +--rw max-probes uint16 | | | | +--rw probe-interval uint16 | | | +--rw ssh-client-parameters | | | | +--rw client-identity | | | | | +--rw username? string | | | | | +--rw (auth-type) - | | | | | +--:(password) - | | | | | | +--rw password? string | | | | | +--:(public-key) | | | | | | +--rw public-key | | | | | | +--rw (local-or-keystore) | | | | | | +--:(local) | | | | | | | {local-definiti\ \ons-supported}? | | | | | | | +--rw local-definition | | | | | | | +--rw algorithm | | | | | | | | iasa:asymm\ \etric-algorithm-type | | | | | | | +--rw public-key-f\ - \ormat? + \ormat | | | | | | | | identityref | | | | | | | +--rw public-key | | | | | | | | binary | | | | | | | +--rw private-key-\ \format? | | | | | | | | identityref | | | | | | | +--rw (private-key\ \-type) | | | | | | | +--:(private-ke\ \y) @@ -2191,50 +2193,120 @@ \ {keystore-supported}? | | | | | | | | +--:(a\ \symmetric-key-ref) | | | | | | | | +--\ \rw asymmetric-key-ref? leafref | | | | | | | | \ \ {keystore-supported}? | | | | | | | +--rw val\ \ue? | | | | | | | b\ + \inary + | | | | | | +--:(keystore) + | | | | | | {keystore-suppo\ + \rted}? + | | | | | | +--rw keystore-refere\ + \nce? + | | | | | | ks:asymmetric\ + \-key-ref + | | | | | +--:(password) + | | | | | | +--rw password? string + | | | | | | {client-identity-passw\ + \ord}? + | | | | | +--:(hostbased) + | | | | | | +--rw hostbased + | | | | | | {client-identity-hostb\ + \ased}? + | | | | | | +--rw (local-or-keystore) + | | | | | | +--:(local) + | | | | | | | {local-definiti\ + \ons-supported}? + | | | | | | | +--rw local-definition + | | | | | | | +--rw algorithm + | | | | | | | | iasa:asymm\ + \etric-algorithm-type + | | | | | | | +--rw public-key-f\ + \ormat + | | | | | | | | identityref + | | | | | | | +--rw public-key + | | | | | | | | binary + | | | | | | | +--rw private-key-\ + \format? + | | | | | | | | identityref + | | | | | | | +--rw (private-key\ + \-type) + | | | | | | | +--:(private-ke\ + \y) + | | | | | | | | +--rw privat\ + \e-key? + | | | | | | | | bina\ + \ry + | | | | | | | +--:(hidden-pri\ + \vate-key) + | | | | | | | | +--rw hidden\ + \-private-key? + | | | | | | | | empty + | | | | | | | +--:(encrypted-\ + \private-key) + | | | | | | | +--rw encryp\ + \ted-private-key + | | | | | | | +--rw (ke\ + \y-type) + | | | | | | | | +--:(s\ + \ymmetric-key-ref) + | | | | | | | | | +--\ + \rw symmetric-key-ref? leafref + | | | | | | | | | \ + \ {keystore-supported}? + | | | | | | | | +--:(a\ + \symmetric-key-ref) + | | | | | | | | +--\ + \rw asymmetric-key-ref? leafref + | | | | | | | | \ + \ {keystore-supported}? + | | | | | | | +--rw val\ + \ue? + | | | | | | | b\ \inary | | | | | | +--:(keystore) | | | | | | {keystore-suppo\ \rted}? | | | | | | +--rw keystore-refere\ \nce? | | | | | | ks:asymmetric\ \-key-ref + | | | | | +--:(none) + | | | | | | +--rw none? empty + | | | | | | {client-identity-none}? | | | | | +--:(certificate) | | | | | +--rw certificate | | | | | {sshcmn:ssh-x509-certs\ \}? | | | | | +--rw (local-or-keystore) | | | | | +--:(local) | | | | | | {local-definiti\ \ons-supported}? | | | | | | +--rw local-definition | | | | | | +--rw algorithm | | | | | | | iasa:asymm\ \etric-algorithm-type | | | | | | +--rw public-key-f\ - \ormat? + \ormat | | | | | | | identityref | | | | | | +--rw public-key | | | | | | | binary | | | | | | +--rw private-key-\ \format? | | | | | | | identityref | | | | | | +--rw (private-key\ + \-type) | | | | | | | +--:(private-ke\ \y) | | | | | | | | +--rw privat\ \e-key? | | | | | | | | bina\ \ry | | | | | | | +--:(hidden-pri\ \vate-key) | | | | | | | | +--rw hidden\ @@ -2298,67 +2370,79 @@ \ric-key-ref | | | | | +--rw certificate?\ \ leafref | | | | +--rw server-authentication | | | | | +--rw ssh-host-keys! | | | | | | +--rw (local-or-truststore) | | | | | | +--:(local) | | | | | | | {local-definitions-su\ \pported}? | | | | | | | +--rw local-definition - | | | | | | | +--rw host-key* - | | | | | | | ct:ssh-host-key + | | | | | | | +--rw public-key* [name] + | | | | | | | +--rw name + | | | | | | | | string + | | | | | | | +--rw algorithm + | | | | | | | | iasa:asymmetr\ + \ic-algorithm-type + | | | | | | | +--rw public-key-form\ + \at + | | | | | | | | identityref + | | | | | | | +--rw public-key + | | | | | | | binary | | | | | | +--:(truststore) | | | | | | {truststore-supported\ - \,ssh-host-keys}? + \,public-keys}? | | | | | | +--rw truststore-reference? - | | | | | | ts:host-keys-ref + | | | | | | ts:public-key-bag-r\ + \ef | | | | | +--rw ca-certs! | | | | | | {sshcmn:ssh-x509-certs}? | | | | | | +--rw (local-or-truststore) | | | | | | +--:(local) | | | | | | | {local-definitions-su\ \pported}? | | | | | | | +--rw local-definition | | | | | | | +--rw cert* | | | | | | | | trust-anchor-cer\ \t-cms | | | | | | | +---n certificate-expira\ \tion | | | | | | | +-- expiration-date | | | | | | | yang:date-and\ \-time | | | | | | +--:(truststore) | | | | | | {truststore-supported\ \,x509-certificates}? | | | | | | +--rw truststore-reference? - | | | | | | ts:certificates-ref + | | | | | | ts:certificate-bag-\ + \ref | | | | | +--rw server-certs! | | | | | {sshcmn:ssh-x509-certs}? | | | | | +--rw (local-or-truststore) | | | | | +--:(local) | | | | | | {local-definitions-su\ \pported}? | | | | | | +--rw local-definition | | | | | | +--rw cert* | | | | | | | trust-anchor-cer\ \t-cms | | | | | | +---n certificate-expira\ \tion | | | | | | +-- expiration-date | | | | | | yang:date-and\ \-time | | | | | +--:(truststore) | | | | | {truststore-supported\ \,x509-certificates}? | | | | | +--rw truststore-reference? - | | | | | ts:certificates-ref + | | | | | ts:certificate-bag-\ + \ref | | | | +--rw transport-params | | | | | {ssh-client-transport-params-co\ \nfig}? | | | | | +--rw host-key | | | | | | +--rw host-key-alg* identityref | | | | | +--rw key-exchange | | | | | | +--rw key-exchange-alg* | | | | | | identityref | | | | | +--rw encryption | | | | | | +--rw encryption-alg* @@ -2379,44 +2463,44 @@ | | | | {local-binding-supported}? | | | +--rw local-port? inet:port-number | | | | {local-binding-supported}? | | | +--rw keepalives! | | | {keepalives-supported}? | | | +--rw idle-time uint16 | | | +--rw max-probes uint16 | | | +--rw probe-interval uint16 | | +--rw tls-client-parameters | | | +--rw client-identity - | | | | +--rw (auth-type) + | | | | +--rw (auth-type)? | | | | +--:(certificate) + | | | | | {x509-certificate-auth}? | | | | | +--rw certificate - | | | | | {x509-certificate-auth\ - \}? | | | | | +--rw (local-or-keystore) | | | | | +--:(local) | | | | | | {local-definiti\ \ons-supported}? | | | | | | +--rw local-definition | | | | | | +--rw algorithm | | | | | | | iasa:asymm\ \etric-algorithm-type | | | | | | +--rw public-key-f\ - \ormat? + \ormat | | | | | | | identityref | | | | | | +--rw public-key | | | | | | | binary | | | | | | +--rw private-key-\ \format? | | | | | | | identityref | | | | | | +--rw (private-key\ \-type) | | | | | | | +--:(private-ke\ + \y) | | | | | | | | +--rw privat\ \e-key? | | | | | | | | bina\ \ry | | | | | | | +--:(hidden-pri\ \vate-key) | | | | | | | | +--rw hidden\ \-private-key? | | | | | | | | empty @@ -2471,32 +2556,32 @@ \rted}? | | | | | +--rw keystore-refere\ \nce | | | | | +--rw asymmetric-k\ \ey? | | | | | | ks:asymmet\ \ric-key-ref | | | | | +--rw certificate?\ \ leafref | | | | +--:(raw-public-key) - | | | | | +--rw raw-public-key | | | | | {raw-public-key-auth}? + | | | | | +--rw raw-private-key | | | | | +--rw (local-or-keystore) | | | | | +--:(local) | | | | | | {local-definiti\ \ons-supported}? | | | | | | +--rw local-definition | | | | | | +--rw algorithm | | | | | | | iasa:asymm\ \etric-algorithm-type | | | | | | +--rw public-key-f\ - \ormat? + \ormat | | | | | | | identityref | | | | | | +--rw public-key | | | | | | | binary | | | | | | +--rw private-key-\ \format? | | | | | | | identityref | | | | | | +--rw (private-key\ \-type) | | | | | | +--:(private-ke\ \y) @@ -2531,63 +2616,68 @@ \ue? | | | | | | b\ \inary | | | | | +--:(keystore) | | | | | {keystore-suppo\ \rted}? | | | | | +--rw keystore-refere\ \nce? | | | | | ks:asymmetric\ \-key-ref - | | | | +--:(psk) - | | | | +--rw psk {psk-auth}? + | | | | +--:(psk) {psk-auth}? + | | | | +--rw psk | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definiti\ \ons-supported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | isa:symmet\ \ric-algorithm-type | | | | | +--rw key-format? | | | | | | identityref | | | | | +--rw (key-type) - | | | | | +--:(key) - | | | | | | +--rw key? - | | | | | | bina\ + | | | | | | +--:(key) + | | | | | | | +--rw key? + | | | | | | | bina\ + \ry - | | | | | +--:(hidden-key) - | | | | | | +--rw hidden\ + | | | | | | +--:(hidden-key) + | | | | | | | +--rw hidden\ \-key? - | | | | | | empty - | | | | | +--:(encrypted-\ + | | | | | | | empty + | | | | | | +--:(encrypted-\ \key) - | | | | | +--rw encryp\ + | | | | | | +--rw encryp\ \ted-key - | | | | | +--rw (ke\ + | | | | | | +--rw (ke\ \y-type) - | | | | | | +--:(s\ + | | | | | | | +--:(s\ \ymmetric-key-ref) - | | | | | | | +--\ + | | | | | | | | +--\ \rw symmetric-key-ref? leafref - | | | | | | | \ + | | | | | | | | \ \ {keystore-supported}? - | | | | | | +--:(a\ + | | | | | | | +--:(a\ \symmetric-key-ref) - | | | | | | +--\ + | | | | | | | +--\ \rw asymmetric-key-ref? leafref - | | | | | | \ + | | | | | | | \ \ {keystore-supported}? - | | | | | +--rw val\ + | | | | | | +--rw val\ \ue? - | | | | | b\ + | | | | | | b\ \inary + | | | | | +--rw id? + | | | | | string + | | | | | {ks:local-\ + \definitions-supported}? | | | | +--:(keystore) | | | | {keystore-suppo\ \rted}? | | | | +--rw keystore-refere\ \nce? | | | | ks:symmetric-\ \key-ref | | | +--rw server-authentication | | | | +--rw ca-certs! | | | | | {x509-certificate-auth}? @@ -2601,66 +2692,67 @@ \t-cms | | | | | | +---n certificate-expira\ \tion | | | | | | +-- expiration-date | | | | | | yang:date-and\ \-time | | | | | +--:(truststore) | | | | | {truststore-supported\ \,x509-certificates}? | | | | | +--rw truststore-reference? - | | | | | ts:certificates-ref + | | | | | ts:certificate-bag-\ + \ref | | | | +--rw server-certs! | | | | | {x509-certificate-auth}? | | | | | +--rw (local-or-truststore) | | | | | +--:(local) | | | | | | {local-definitions-su\ \pported}? | | | | | | +--rw local-definition | | | | | | +--rw cert* | | | | | | | trust-anchor-cer\ \t-cms | | | | | | +---n certificate-expira\ \tion | | | | | | +-- expiration-date | | | | | | yang:date-and\ \-time | | | | | +--:(truststore) | | | | | {truststore-supported\ \,x509-certificates}? | | | | | +--rw truststore-reference? - | | | | | ts:certificates-ref + | | | | | ts:certificate-bag-\ + \ref | | | | +--rw raw-public-keys! | | | | | {raw-public-key-auth}? | | | | | +--rw (local-or-truststore) | | | | | +--:(local) | | | | | | {local-definitions-su\ \pported}? | | | | | | +--rw local-definition - | | | | | | +--rw raw-public-key* - | | | | | | [name] + | | | | | | +--rw public-key* [name] | | | | | | +--rw name | | | | | | | string | | | | | | +--rw algorithm | | | | | | | iasa:asymmetr\ \ic-algorithm-type | | | | | | +--rw public-key-form\ - \at? + \at | | | | | | | identityref | | | | | | +--rw public-key | | | | | | binary | | | | | +--:(truststore) | | | | | {truststore-supported\ - \,raw-public-keys}? + \,public-keys}? | | | | | +--rw truststore-reference? - | | | | | ts:raw-public-keys-\ - \ref + | | | | | ts:public-key-bag-r\ + \ef | | | | +--rw psks! {psk-auth}? | | | +--rw hello-params | | | | {tls-client-hello-params-config\ \}? | | | | +--rw tls-versions | | | | | +--rw tls-version* identityref | | | | +--rw cipher-suites | | | | +--rw cipher-suite* identityref | | | +--rw keepalives! | | | {tls-client-keepalives}? @@ -2690,33 +2782,84 @@ | | +--rw local-address inet:ip-address | | +--rw local-port? inet:port-number | | +--rw keepalives! {keepalives-supported}? | | +--rw idle-time uint16 | | +--rw max-probes uint16 | | +--rw probe-interval uint16 | +--rw ssh-client-parameters | | +--rw client-identity | | | +--rw username? string | | | +--rw (auth-type) - | | | +--:(password) - | | | | +--rw password? string | | | +--:(public-key) | | | | +--rw public-key | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definitions-su\ \pported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | iasa:asymmetric-\ \algorithm-type - | | | | | +--rw public-key-format? + | | | | | +--rw public-key-format + | | | | | | identityref + | | | | | +--rw public-key + | | | | | | binary + | | | | | +--rw private-key-format? + | | | | | | identityref + | | | | | +--rw (private-key-type) + | | | | | +--:(private-key) + | | | | | | +--rw private-key? + | | | | | | binary + | | | | | +--:(hidden-private-k\ + \ey) + | | | | | | +--rw hidden-priva\ + \te-key? + | | | | | | empty + | | | | | +--:(encrypted-privat\ + \e-key) + | | | | | +--rw encrypted-pr\ + \ivate-key + | | | | | +--rw (key-type) + | | | | | | +--:(symmetr\ + \ic-key-ref) + | | | | | | | +--rw sym\ + \metric-key-ref? leafref + | | | | | | | {\ + \keystore-supported}? + | | | | | | +--:(asymmet\ + \ric-key-ref) + | | | | | | +--rw asy\ + \mmetric-key-ref? leafref + | | | | | | {\ + \keystore-supported}? + | | | | | +--rw value? + | | | | | binary + | | | | +--:(keystore) + | | | | {keystore-supported}? + | | | | +--rw keystore-reference? + | | | | ks:asymmetric-key-r\ + \ef + | | | +--:(password) + | | | | +--rw password? string + | | | | {client-identity-password}? + | | | +--:(hostbased) + | | | | +--rw hostbased + | | | | {client-identity-hostbased}? + | | | | +--rw (local-or-keystore) + | | | | +--:(local) + | | | | | {local-definitions-su\ + \pported}? + | | | | | +--rw local-definition + | | | | | +--rw algorithm + | | | | | | iasa:asymmetric-\ + \algorithm-type + | | | | | +--rw public-key-format | | | | | | identityref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-key-format? | | | | | | identityref | | | | | +--rw (private-key-type) | | | | | +--:(private-key) | | | | | | +--rw private-key? | | | | | | binary | | | | | +--:(hidden-private-k\ @@ -2741,32 +2885,35 @@ \mmetric-key-ref? leafref | | | | | | {\ \keystore-supported}? | | | | | +--rw value? | | | | | binary | | | | +--:(keystore) | | | | {keystore-supported}? | | | | +--rw keystore-reference? | | | | ks:asymmetric-key-r\ \ef + | | | +--:(none) + | | | | +--rw none? empty + | | | | {client-identity-none}? | | | +--:(certificate) | | | +--rw certificate | | | {sshcmn:ssh-x509-certs}? | | | +--rw (local-or-keystore) | | | +--:(local) | | | | {local-definitions-su\ \pported}? | | | | +--rw local-definition | | | | +--rw algorithm | | | | | iasa:asymmetric-\ \algorithm-type - | | | | +--rw public-key-format? + | | | | +--rw public-key-format | | | | | identityref | | | | +--rw public-key | | | | | binary | | | | +--rw private-key-format? | | | | | identityref | | | | +--rw (private-key-type) | | | | | +--:(private-key) | | | | | | +--rw private-key? | | | | | | binary | | | | | +--:(hidden-private-k\ @@ -2820,60 +2967,68 @@ \y-ref | | | +--rw certificate? \ \leafref | | +--rw server-authentication | | | +--rw ssh-host-keys! | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-supporte\ \d}? | | | | | +--rw local-definition - | | | | | +--rw host-key* - | | | | | ct:ssh-host-key + | | | | | +--rw public-key* [name] + | | | | | +--rw name + | | | | | | string + | | | | | +--rw algorithm + | | | | | | iasa:asymmetric-alg\ + \orithm-type + | | | | | +--rw public-key-format + | | | | | | identityref + | | | | | +--rw public-key + | | | | | binary | | | | +--:(truststore) - | | | | {truststore-supported,ssh-h\ - \ost-keys}? + | | | | {truststore-supported,publi\ + \c-keys}? | | | | +--rw truststore-reference? - | | | | ts:host-keys-ref + | | | | ts:public-key-bag-ref | | | +--rw ca-certs! {sshcmn:ssh-x509-certs}? | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-supporte\ \d}? | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cert-cms | | | | | +---n certificate-expiration | | | | | +-- expiration-date | | | | | yang:date-and-time | | | | +--:(truststore) | | | | {truststore-supported,x509-\ \certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-ref | | | +--rw server-certs! | | | {sshcmn:ssh-x509-certs}? | | | +--rw (local-or-truststore) | | | +--:(local) | | | | {local-definitions-supporte\ \d}? | | | | +--rw local-definition | | | | +--rw cert* | | | | | trust-anchor-cert-cms | | | | +---n certificate-expiration | | | | +-- expiration-date | | | | yang:date-and-time | | | +--:(truststore) | | | {truststore-supported,x509-\ \certificates}? | | | +--rw truststore-reference? - | | | ts:certificates-ref + | | | ts:certificate-bag-ref | | +--rw transport-params | | | {ssh-client-transport-params-config}? | | | +--rw host-key | | | | +--rw host-key-alg* identityref | | | +--rw key-exchange | | | | +--rw key-exchange-alg* identityref | | | +--rw encryption | | | | +--rw encryption-alg* identityref | | | +--rw mac | | | +--rw mac-alg* identityref @@ -2885,33 +3040,33 @@ +--rw tls +--rw tcp-server-parameters | +--rw local-address inet:ip-address | +--rw local-port? inet:port-number | +--rw keepalives! {keepalives-supported}? | +--rw idle-time uint16 | +--rw max-probes uint16 | +--rw probe-interval uint16 +--rw tls-client-parameters | +--rw client-identity - | | +--rw (auth-type) + | | +--rw (auth-type)? | | +--:(certificate) - | | | +--rw certificate | | | {x509-certificate-auth}? + | | | +--rw certificate | | | +--rw (local-or-keystore) | | | +--:(local) | | | | {local-definitions-su\ \pported}? | | | | +--rw local-definition | | | | +--rw algorithm | | | | | iasa:asymmetric-\ \algorithm-type - | | | | +--rw public-key-format? + | | | | +--rw public-key-format | | | | | identityref | | | | +--rw public-key | | | | | binary | | | | +--rw private-key-format? | | | | | identityref | | | | +--rw (private-key-type) | | | | | +--:(private-key) | | | | | | +--rw private-key? | | | | | | binary | | | | | +--:(hidden-private-k\ @@ -2960,31 +3114,31 @@ | | | | binary | | | +--:(keystore) | | | {keystore-supported}? | | | +--rw keystore-reference | | | +--rw asymmetric-key? | | | | ks:asymmetric-ke\ \y-ref | | | +--rw certificate? \ \leafref | | +--:(raw-public-key) - | | | +--rw raw-public-key | | | {raw-public-key-auth}? + | | | +--rw raw-private-key | | | +--rw (local-or-keystore) | | | +--:(local) | | | | {local-definitions-su\ \pported}? | | | | +--rw local-definition | | | | +--rw algorithm | | | | | iasa:asymmetric-\ \algorithm-type - | | | | +--rw public-key-format? + | | | | +--rw public-key-format | | | | | identityref | | | | +--rw public-key | | | | | binary | | | | +--rw private-key-format? | | | | | identityref | | | | +--rw (private-key-type) | | | | +--:(private-key) | | | | | +--rw private-key? | | | | | binary | | | | +--:(hidden-private-k\ @@ -3009,116 +3163,120 @@ \mmetric-key-ref? leafref | | | | | {\ \keystore-supported}? | | | | +--rw value? | | | | binary | | | +--:(keystore) | | | {keystore-supported}? | | | +--rw keystore-reference? | | | ks:asymmetric-key-r\ \ef - | | +--:(psk) - | | +--rw psk {psk-auth}? + | | +--:(psk) {psk-auth}? + | | +--rw psk | | +--rw (local-or-keystore) | | +--:(local) | | | {local-definitions-su\ \pported}? | | | +--rw local-definition | | | +--rw algorithm | | | | isa:symmetric-al\ \gorithm-type | | | +--rw key-format? | | | | identityref | | | +--rw (key-type) - | | | +--:(key) - | | | | +--rw key? - | | | | binary - | | | +--:(hidden-key) - | | | | +--rw hidden-key? - | | | | empty - | | | +--:(encrypted-key) - | | | +--rw encrypted-key - | | | +--rw (key-type) - | | | | +--:(symmetr\ + | | | | +--:(key) + | | | | | +--rw key? + | | | | | binary + | | | | +--:(hidden-key) + | | | | | +--rw hidden-key? + | | | | | empty + | | | | +--:(encrypted-key) + | | | | +--rw encrypted-key + | | | | +--rw (key-type) + | | | | | +--:(symmetr\ \ic-key-ref) - | | | | | +--rw sym\ + | | | | | | +--rw sym\ \metric-key-ref? leafref - | | | | | {\ + | | | | | | {\ \keystore-supported}? - | | | | +--:(asymmet\ + | | | | | +--:(asymmet\ \ric-key-ref) - | | | | +--rw asy\ + | | | | | +--rw asy\ \mmetric-key-ref? leafref - | | | | {\ + | | | | | {\ \keystore-supported}? - | | | +--rw value? - | | | binary + | | | | +--rw value? + | | | | binary + | | | +--rw id? + | | | string + | | | {ks:local-defini\ + \tions-supported}? | | +--:(keystore) | | {keystore-supported}? | | +--rw keystore-reference? | | ks:symmetric-key-ref | +--rw server-authentication | | +--rw ca-certs! {x509-certificate-auth}? | | | +--rw (local-or-truststore) | | | +--:(local) | | | | {local-definitions-supporte\ \d}? | | | | +--rw local-definition | | | | +--rw cert* | | | | | trust-anchor-cert-cms | | | | +---n certificate-expiration | | | | +-- expiration-date | | | | yang:date-and-time | | | +--:(truststore) | | | {truststore-supported,x509-\ \certificates}? | | | +--rw truststore-reference? - | | | ts:certificates-ref + | | | ts:certificate-bag-ref | | +--rw server-certs! | | | {x509-certificate-auth}? | | | +--rw (local-or-truststore) | | | +--:(local) | | | | {local-definitions-supporte\ \d}? | | | | +--rw local-definition | | | | +--rw cert* | | | | | trust-anchor-cert-cms | | | | +---n certificate-expiration | | | | +-- expiration-date | | | | yang:date-and-time | | | +--:(truststore) | | | {truststore-supported,x509-\ \certificates}? | | | +--rw truststore-reference? - | | | ts:certificates-ref + | | | ts:certificate-bag-ref | | +--rw raw-public-keys! | | | {raw-public-key-auth}? | | | +--rw (local-or-truststore) | | | +--:(local) | | | | {local-definitions-supporte\ \d}? | | | | +--rw local-definition - | | | | +--rw raw-public-key* [name] + | | | | +--rw public-key* [name] | | | | +--rw name | | | | | string | | | | +--rw algorithm | | | | | iasa:asymmetric-alg\ \orithm-type - | | | | +--rw public-key-format? + | | | | +--rw public-key-format | | | | | identityref | | | | +--rw public-key | | | | binary | | | +--:(truststore) - | | | {truststore-supported,raw-p\ - \ublic-keys}? + | | | {truststore-supported,publi\ + \c-keys}? | | | +--rw truststore-reference? - | | | ts:raw-public-keys-ref + | | | ts:public-key-bag-ref | | +--rw psks! {psk-auth}? | +--rw hello-params | | {tls-client-hello-params-config}? | | +--rw tls-versions | | | +--rw tls-version* identityref | | +--rw cipher-suites | | +--rw cipher-suite* identityref | +--rw keepalives! {tls-client-keepalives}? | +--rw max-wait? uint16 | +--rw max-attempts? uint8 @@ -3162,21 +3320,21 @@ | | | | | +--rw public-key | | | | | +--rw (local-or-keystore) | | | | | +--:(local) | | | | | | {local-definitions\ \-supported}? | | | | | | +--rw local-definition | | | | | | +--rw algorithm | | | | | | | iasa:asymmetr\ \ic-algorithm-type | | | | | | +--rw public-key-form\ - \at? + \at | | | | | | | identityref | | | | | | +--rw public-key | | | | | | | binary | | | | | | +--rw private-key-for\ \mat? | | | | | | | identityref | | | | | | +--rw (private-key-ty\ \pe) | | | | | | +--:(private-key) | | | | | | | +--rw private-k\ @@ -3219,21 +3378,21 @@ | | | | {sshcmn:ssh-x509-certs}? | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definitions\ \-supported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | iasa:asymmetr\ \ic-algorithm-type | | | | | +--rw public-key-form\ - \at? + \at | | | | | | identityref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-key-for\ \mat? | | | | | | identityref | | | | | +--rw (private-key-ty\ \pe) | | | | | | +--:(private-key) | | | | | | | +--rw private-k\ @@ -3292,76 +3450,116 @@ | | | | +--rw keystore-reference | | | | +--rw asymmetric-key? | | | | | ks:asymmetric\ \-key-ref | | | | +--rw certificate? \ \ leafref | | | +--rw client-authentication | | | | +--rw supported-authentication-methods | | | | | +--rw publickey? empty | | | | | +--rw passsword? empty + | | | | | | {client-auth-password}? | | | | | +--rw hostbased? empty + | | | | | | {client-auth-hostbased}? | | | | | +--rw none? empty - | | | | | +--rw other* string + | | | | | {client-auth-none}? | | | | +--rw users {client-auth-config-supported}? | | | | | +--rw user* [name] | | | | | +--rw name string - | | | | | +--rw password? ianach:crypt-hash - | | | | | +--rw host-keys! - | | | | | +--rw (local-or-truststore) - | | | | | +--:(local) - | | | | | | {local-definitions-su\ + | | | | | +--rw public-keys! + | | | | | | +--rw (local-or-truststore) + | | | | | | +--:(local) + | | | | | | | {local-definitions-su\ \pported}? - | | | | | | +--rw local-definition - | | | | | | +--rw host-key* - | | | | | | ct:ssh-host-key - | | | | | +--:(truststore) - | | | | | {truststore-supported\ - \,ssh-host-keys}? - | | | | | +--rw truststore-reference? - | | | | | ts:host-keys-ref + | | | | | | | +--rw local-definition + | | | | | | | +--rw public-key* [name] + | | | | | | | +--rw name + | | | | | | | | string + | | | | | | | +--rw algorithm + | | | | | | | | iasa:asymmetr\ + \ic-algorithm-type + | | | | | | | +--rw public-key-form\ + \at + | | | | | | | | identityref + | | | | | | | +--rw public-key + | | | | | | | binary + | | | | | | +--:(truststore) + | | | | | | {truststore-supported\ + \,public-keys}? + | | | | | | +--rw truststore-reference? + | | | | | | ts:public-key-bag-r\ + \ef + | | | | | +--rw password? + | | | | | | ianach:crypt-hash + | | | | | | {client-auth-password}? + | | | | | +--rw hostbased! + | | | | | | {client-auth-hostbased}? + | | | | | | +--rw (local-or-truststore) + | | | | | | +--:(local) + | | | | | | | {local-definitions-su\ + \pported}? + | | | | | | | +--rw local-definition + | | | | | | | +--rw public-key* [name] + | | | | | | | +--rw name + | | | | | | | | string + | | | | | | | +--rw algorithm + | | | | | | | | iasa:asymmetr\ + \ic-algorithm-type + | | | | | | | +--rw public-key-form\ + \at + | | | | | | | | identityref + | | | | | | | +--rw public-key + | | | | | | | binary + | | | | | | +--:(truststore) + | | | | | | {truststore-supported\ + \,public-keys}? + | | | | | | +--rw truststore-reference? + | | | | | | ts:public-key-bag-r\ + \ef + | | | | | +--rw none? empty + | | | | | {client-auth-none}? | | | | +--rw ca-certs! | | | | | {client-auth-config-supported,sshc\ \mn:ssh-x509-certs}? | | | | | +--rw (local-or-truststore) | | | | | +--:(local) | | | | | | {local-definitions-supporte\ \d}? | | | | | | +--rw local-definition | | | | | | +--rw cert* | | | | | | | trust-anchor-cert-cms | | | | | | +---n certificate-expiration | | | | | | +-- expiration-date | | | | | | yang:date-and-time | | | | | +--:(truststore) | | | | | {truststore-supported,x509-\ \certificates}? | | | | | +--rw truststore-reference? - | | | | | ts:certificates-ref + | | | | | ts:certificate-bag-ref | | | | +--rw client-certs! | | | | {client-auth-config-supported,sshc\ \mn:ssh-x509-certs}? | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-supporte\ \d}? | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cert-cms | | | | | +---n certificate-expiration | | | | | +-- expiration-date | | | | | yang:date-and-time | | | | +--:(truststore) | | | | {truststore-supported,x509-\ \certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-ref | | | +--rw transport-params | | | | {ssh-server-transport-params-config}? | | | | +--rw host-key | | | | | +--rw host-key-alg* identityref | | | | +--rw key-exchange | | | | | +--rw key-exchange-alg* identityref | | | | +--rw encryption | | | | | +--rw encryption-alg* identityref | | | | +--rw mac | | | | +--rw mac-alg* identityref @@ -3384,31 +3582,31 @@ | | +--rw local-address inet:ip-address | | +--rw local-port? inet:port-number | | +--rw keepalives! {keepalives-supported}? | | +--rw idle-time uint16 | | +--rw max-probes uint16 | | +--rw probe-interval uint16 | +--rw tls-server-parameters | | +--rw server-identity | | | +--rw (auth-type) | | | +--:(certificate) - | | | | +--rw certificate | | | | {x509-certificate-auth}? + | | | | +--rw certificate | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definitions-su\ \pported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | iasa:asymmetric-\ \algorithm-type - | | | | | +--rw public-key-format? + | | | | | +--rw public-key-format | | | | | | identityref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-key-format? | | | | | | identityref | | | | | +--rw (private-key-type) | | | | | | +--:(private-key) | | | | | | | +--rw private-key? | | | | | | | binary | | | | | | +--:(hidden-private-k\ @@ -3456,31 +3654,31 @@ | | | | | binary | | | | +--:(keystore) | | | | {keystore-supported}? | | | | +--rw keystore-reference | | | | +--rw asymmetric-key? | | | | | ks:asymmetric-ke\ \y-ref | | | | +--rw certificate? \ \leafref | | | +--:(raw-private-key) - | | | | +--rw raw-private-key | | | | {raw-public-key-auth}? + | | | | +--rw raw-private-key | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definitions-su\ \pported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | iasa:asymmetric-\ \algorithm-type - | | | | | +--rw public-key-format? + | | | | | +--rw public-key-format | | | | | | identityref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-key-format? | | | | | | identityref | | | | | +--rw (private-key-type) | | | | | +--:(private-key) | | | | | | +--rw private-key? | | | | | | binary | | | | | +--:(hidden-private-k\ @@ -3506,56 +3703,60 @@ \mmetric-key-ref? leafref | | | | | | {\ \keystore-supported}? | | | | | +--rw value? | | | | | binary | | | | +--:(keystore) | | | | {keystore-supported}? | | | | +--rw keystore-reference? | | | | ks:asymmetric-key-r\ \ef - | | | +--:(psk) - | | | +--rw psk {psk-auth}? + | | | +--:(psk) {psk-auth}? + | | | +--rw psk | | | +--rw (local-or-keystore) | | | +--:(local) | | | | {local-definitions-su\ \pported}? | | | | +--rw local-definition | | | | +--rw algorithm | | | | | isa:symmetric-al\ \gorithm-type | | | | +--rw key-format? | | | | | identityref | | | | +--rw (key-type) - | | | | +--:(key) - | | | | | +--rw key? - | | | | | binary - | | | | +--:(hidden-key) - | | | | | +--rw hidden-key? - | | | | | empty - | | | | +--:(encrypted-key) - | | | | +--rw encrypted-key - | | | | +--rw (key-type) - | | | | | +--:(symmetr\ + | | | | | +--:(key) + | | | | | | +--rw key? + | | | | | | binary + | | | | | +--:(hidden-key) + | | | | | | +--rw hidden-key? + | | | | | | empty + | | | | | +--:(encrypted-key) + | | | | | +--rw encrypted-key + | | | | | +--rw (key-type) + | | | | | | +--:(symmetr\ \ic-key-ref) - | | | | | | +--rw sym\ + | | | | | | | +--rw sym\ \metric-key-ref? leafref - | | | | | | {\ + | | | | | | | {\ \keystore-supported}? - | | | | | +--:(asymmet\ + | | | | | | +--:(asymmet\ \ric-key-ref) - | | | | | +--rw asy\ + | | | | | | +--rw asy\ \mmetric-key-ref? leafref - | | | | | {\ + | | | | | | {\ \keystore-supported}? - | | | | +--rw value? - | | | | binary + | | | | | +--rw value? + | | | | | binary + | | | | +--rw id? + | | | | string + | | | | {ks:local-defini\ + \tions-supported}? | | | +--:(keystore) | | | {keystore-supported}? | | | +--rw keystore-reference? | | | ks:symmetric-key-ref | | +--rw client-authentication! | | | {client-auth-config-supported}? | | | +--rw ca-certs! {x509-certificate-auth}? | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-supporte\ @@ -3563,60 +3764,61 @@ | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cert-cms | | | | | +---n certificate-expiration | | | | | +-- expiration-date | | | | | yang:date-and-time | | | | +--:(truststore) | | | | {truststore-supported,x509-\ \certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-ref | | | +--rw client-certs! | | | | {x509-certificate-auth}? | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-supporte\ \d}? | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cert-cms | | | | | +---n certificate-expiration | | | | | +-- expiration-date | | | | | yang:date-and-time | | | | +--:(truststore) | | | | {truststore-supported,x509-\ \certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-ref | | | +--rw raw-public-keys! - | | | {raw-public-key-auth}? - | | | +--rw (local-or-truststore) - | | | +--:(local) - | | | | {local-definitions-supporte\ + | | | | {raw-public-key-auth}? + | | | | +--rw (local-or-truststore) + | | | | +--:(local) + | | | | | {local-definitions-supporte\ \d}? - | | | | +--rw local-definition - | | | | +--rw raw-public-key* [name] - | | | | +--rw name - | | | | | string - | | | | +--rw algorithm - | | | | | iasa:asymmetric-alg\ + | | | | | +--rw local-definition + | | | | | +--rw public-key* [name] + | | | | | +--rw name + | | | | | | string + | | | | | +--rw algorithm + | | | | | | iasa:asymmetric-alg\ \orithm-type - | | | | +--rw public-key-format? - | | | | | identityref - | | | | +--rw public-key - | | | | binary - | | | +--:(truststore) - | | | {truststore-supported,raw-p\ - \ublic-keys}? - | | | +--rw truststore-reference? - | | | ts:raw-public-keys-ref + | | | | | +--rw public-key-format + | | | | | | identityref + | | | | | +--rw public-key + | | | | | binary + | | | | +--:(truststore) + | | | | {truststore-supported,publi\ + \c-keys}? + | | | | +--rw truststore-reference? + | | | | ts:public-key-bag-ref + | | | +--rw psks! {psk-auth}? | | +--rw hello-params | | | {tls-server-hello-params-config}? | | | +--rw tls-versions | | | | +--rw tls-version* identityref | | | +--rw cipher-suites | | | +--rw cipher-suite* identityref | | +--rw keepalives! {tls-server-keepalives}? | | +--rw max-wait? uint16 | | +--rw max-attempts? uint8 | +--rw netconf-server-parameters @@ -3660,21 +3862,21 @@ | | | | | +--rw (local-or-keystore) | | | | | +--:(local) | | | | | | {local-defin\ \itions-supported}? | | | | | | +--rw local-defini\ \tion | | | | | | +--rw algorithm | | | | | | | iasa:as\ \ymmetric-algorithm-type | | | | | | +--rw public-ke\ - \y-format? + \y-format | | | | | | | identit\ \yref | | | | | | +--rw public-key | | | | | | | binary | | | | | | +--rw private-k\ \ey-format? | | | | | | | identit\ \yref | | | | | | +--rw (private-\ \key-type) @@ -3727,27 +3929,26 @@ | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-defin\ \itions-supported}? | | | | | +--rw local-defini\ \tion | | | | | +--rw algorithm | | | | | | iasa:as\ \ymmetric-algorithm-type | | | | | +--rw public-ke\ - \y-format? + \y-format | | | | | | identit\ \yref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-k\ - \ey-format? | | | | | | identit\ \yref | | | | | +--rw (private-\ \key-type) | | | | | | +--:(private\ \-key) | | | | | | | +--rw pri\ \vate-key? | | | | | | | b\ @@ -3814,88 +4015,135 @@ \c-key? | | | | | ks:asym\ \metric-key-ref | | | | +--rw certifica\ \te? leafref | | | +--rw client-authentication | | | | +--rw supported-authentication-metho\ \ds | | | | | +--rw publickey? empty | | | | | +--rw passsword? empty + | | | | | | {client-auth-password}? | | | | | +--rw hostbased? empty + | | | | | | {client-auth-hostbased}? | | | | | +--rw none? empty - | | | | | +--rw other* string + | | | | | {client-auth-none}? | | | | +--rw users | | | | | {client-auth-config-supporte\ \d}? | | | | | +--rw user* [name] | | | | | +--rw name string + | | | | | +--rw public-keys! + | | | | | | +--rw (local-or-truststore) + | | | | | | +--:(local) + | | | | | | | {local-definiti\ + + \ons-supported}? + | | | | | | | +--rw local-definition + | | | | | | | +--rw public-key* + | | | | | | | [name] + | | | | | | | +--rw name + | | | | | | | | string + | | | | | | | +--rw algorithm + | | | | | | | | iasa:as\ + \ymmetric-algorithm-type + | | | | | | | +--rw public-ke\ + \y-format + | | | | | | | | identit\ + \yref + | | | | | | | +--rw public-key + | | | | | | | binary + | | | | | | +--:(truststore) + | | | | | | {truststore-sup\ + \ported,public-keys}? + | | | | | | +--rw truststore-refe\ + \rence? + | | | | | | ts:public-key\ + \-bag-ref | | | | | +--rw password? | | | | | | ianach:crypt-hash - | | | | | +--rw host-keys! - | | | | | +--rw (local-or-truststore) - | | | | | +--:(local) - | | | | | | {local-definiti\ + | | | | | | {client-auth-password}? + | | | | | +--rw hostbased! + | | | | | | {client-auth-hostbased\ + \}? + | | | | | | +--rw (local-or-truststore) + | | | | | | +--:(local) + | | | | | | | {local-definiti\ \ons-supported}? - | | | | | | +--rw local-definition - | | | | | | +--rw host-key* - | | | | | | ct:ssh-hos\ - \t-key - | | | | | +--:(truststore) - | | | | | {truststore-sup\ - \ported,ssh-host-keys}? - | | | | | +--rw truststore-refe\ + | | | | | | | +--rw local-definition + | | | | | | | +--rw public-key* + | | | | | | | [name] + | | | | | | | +--rw name + | | | | | | | | string + | | | | | | | +--rw algorithm + | | | | | | | | iasa:as\ + \ymmetric-algorithm-type + | | | | | | | +--rw public-ke\ + \y-format + | | | | | | | | identit\ + \yref + | | | | | | | +--rw public-key + | | | | | | | binary + | | | | | | +--:(truststore) + | | | | | | {truststore-sup\ + + \ported,public-keys}? + | | | | | | +--rw truststore-refe\ \rence? - | | | | | ts:host-keys-\ - \ref + | | | | | | ts:public-key\ + \-bag-ref + | | | | | +--rw none? empty + | | | | | {client-auth-none}? | | | | +--rw ca-certs! | | | | | {client-auth-config-supporte\ \d,sshcmn:ssh-x509-certs}? | | | | | +--rw (local-or-truststore) | | | | | +--:(local) | | | | | | {local-definitions-su\ \pported}? | | | | | | +--rw local-definition | | | | | | +--rw cert* | | | | | | | trust-anchor-cer\ \t-cms | | | | | | +---n certificate-expira\ \tion | | | | | | +-- expiration-date | | | | | | yang:date-and\ \-time | | | | | +--:(truststore) | | | | | {truststore-supported\ \,x509-certificates}? | | | | | +--rw truststore-reference? - | | | | | ts:certificates-ref + | | | | | ts:certificate-bag-\ + \ref | | | | +--rw client-certs! | | | | {client-auth-config-supporte\ \d,sshcmn:ssh-x509-certs}? | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-su\ \pported}? | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cer\ \t-cms | | | | | +---n certificate-expira\ \tion | | | | | +-- expiration-date | | | | | yang:date-and\ \-time | | | | +--:(truststore) | | | | {truststore-supported\ \,x509-certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-\ + \ref | | | +--rw transport-params | | | | {ssh-server-transport-params-co\ \nfig}? | | | | +--rw host-key | | | | | +--rw host-key-alg* identityref | | | | +--rw key-exchange | | | | | +--rw key-exchange-alg* | | | | | identityref | | | | +--rw encryption | | | | | +--rw encryption-alg* @@ -3927,33 +4175,32 @@ | | | {local-binding-supported}? | | +--rw keepalives! | | {keepalives-supported}? | | +--rw idle-time uint16 | | +--rw max-probes uint16 | | +--rw probe-interval uint16 | +--rw tls-server-parameters | | +--rw server-identity | | | +--rw (auth-type) | | | +--:(certificate) + | | | | {x509-certificate-auth}? | | | | +--rw certificate - | | | | {x509-certificate-auth\ - \}? | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definiti\ \ons-supported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | iasa:asymm\ \etric-algorithm-type | | | | | +--rw public-key-f\ - \ormat? + \ormat | | | | | | identityref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-key-\ \format? | | | | | | identityref | | | | | +--rw (private-key\ \-type) | | | | | | +--:(private-ke\ \y) @@ -4018,33 +4265,32 @@ \rted}? | | | | +--rw keystore-refere\ \nce | | | | +--rw asymmetric-k\ \ey? | | | | | ks:asymmet\ \ric-key-ref | | | | +--rw certificate?\ \ leafref | | | +--:(raw-private-key) - | | | | +--rw raw-private-key | | | | {raw-public-key-auth}? + | | | | +--rw raw-private-key | | | | +--rw (local-or-keystore) | | | | +--:(local) | | | | | {local-definiti\ - \ons-supported}? | | | | | +--rw local-definition | | | | | +--rw algorithm | | | | | | iasa:asymm\ \etric-algorithm-type | | | | | +--rw public-key-f\ - \ormat? + \ormat | | | | | | identityref | | | | | +--rw public-key | | | | | | binary | | | | | +--rw private-key-\ \format? | | | | | | identityref | | | | | +--rw (private-key\ \-type) | | | | | +--:(private-ke\ \y) @@ -4074,68 +4320,73 @@ | | | | | | +--\ \rw asymmetric-key-ref? leafref | | | | | | \ \ {keystore-supported}? | | | | | +--rw val\ \ue? | | | | | b\ \inary | | | | +--:(keystore) | | | | {keystore-suppo\ + \rted}? | | | | +--rw keystore-refere\ \nce? | | | | ks:asymmetric\ \-key-ref - | | | +--:(psk) - | | | +--rw psk {psk-auth}? + | | | +--:(psk) {psk-auth}? + | | | +--rw psk | | | +--rw (local-or-keystore) | | | +--:(local) | | | | {local-definiti\ \ons-supported}? | | | | +--rw local-definition | | | | +--rw algorithm | | | | | isa:symmet\ \ric-algorithm-type | | | | +--rw key-format? | | | | | identityref | | | | +--rw (key-type) - | | | | +--:(key) - | | | | | +--rw key? - | | | | | bina\ + | | | | | +--:(key) + | | | | | | +--rw key? + | | | | | | bina\ \ry - | | | | +--:(hidden-key) - | | | | | +--rw hidden\ + | | | | | +--:(hidden-key) + | | | | | | +--rw hidden\ \-key? - | | | | | empty - | | | | +--:(encrypted-\ + | | | | | | empty + | | | | | +--:(encrypted-\ \key) - | | | | +--rw encryp\ + | | | | | +--rw encryp\ \ted-key - | | | | +--rw (ke\ + | | | | | +--rw (ke\ \y-type) - | | | | | +--:(s\ + | | | | | | +--:(s\ \ymmetric-key-ref) - | | | | | | +--\ + | | | | | | | +--\ \rw symmetric-key-ref? leafref - | | | | | | \ + | | | | | | | \ \ {keystore-supported}? - | | | | | +--:(a\ + | | | | | | +--:(a\ \symmetric-key-ref) - | | | | | +--\ + | | | | | | +--\ \rw asymmetric-key-ref? leafref - | | | | | \ + | | | | | | \ \ {keystore-supported}? - | | | | +--rw val\ + | | | | | +--rw val\ \ue? - | | | | b\ + | | | | | b\ \inary + | | | | +--rw id? + | | | | string + | | | | {ks:local-\ + \definitions-supported}? | | | +--:(keystore) | | | {keystore-suppo\ \rted}? | | | +--rw keystore-refere\ \nce? | | | ks:symmetric-\ \key-ref | | +--rw client-authentication! | | | {client-auth-config-supported}? | | | +--rw ca-certs! @@ -4150,21 +4401,22 @@ \t-cms | | | | | +---n certificate-expira\ \tion | | | | | +-- expiration-date | | | | | yang:date-and\ \-time | | | | +--:(truststore) | | | | {truststore-supported\ \,x509-certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-\ + \ref | | | +--rw client-certs! | | | | {x509-certificate-auth}? | | | | +--rw (local-or-truststore) | | | | +--:(local) | | | | | {local-definitions-su\ \pported}? | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cer\ \t-cms @@ -4165,52 +4417,53 @@ | | | | | {local-definitions-su\ \pported}? | | | | | +--rw local-definition | | | | | +--rw cert* | | | | | | trust-anchor-cer\ \t-cms | | | | | +---n certificate-expira\ \tion | | | | | +-- expiration-date | | | | | yang:date-and\ + \-time | | | | +--:(truststore) | | | | {truststore-supported\ - \,x509-certificates}? | | | | +--rw truststore-reference? - | | | | ts:certificates-ref + | | | | ts:certificate-bag-\ + \ref | | | +--rw raw-public-keys! - | | | {raw-public-key-auth}? - | | | +--rw (local-or-truststore) - | | | +--:(local) - | | | | {local-definitions-su\ + | | | | {raw-public-key-auth}? + | | | | +--rw (local-or-truststore) + | | | | +--:(local) + | | | | | {local-definitions-su\ \pported}? - | | | | +--rw local-definition - | | | | +--rw raw-public-key* - | | | | [name] - | | | | +--rw name - | | | | | string - | | | | +--rw algorithm - | | | | | iasa:asymmetr\ + | | | | | +--rw local-definition + | | | | | +--rw public-key* [name] + | | | | | +--rw name + | | | | | | string + | | | | | +--rw algorithm + | | | | | | iasa:asymmetr\ \ic-algorithm-type - | | | | +--rw public-key-form\ - \at? - | | | | | identityref - | | | | +--rw public-key - | | | | binary - | | | +--:(truststore) - | | | {truststore-supported\ - \,raw-public-keys}? - | | | +--rw truststore-reference? - | | | ts:raw-public-keys-\ - \ref + | | | | | +--rw public-key-form\ + \at + | | | | | | identityref + | | | | | +--rw public-key + | | | | | binary + | | | | +--:(truststore) + | | | | {truststore-supported\ + \,public-keys}? + | | | | +--rw truststore-reference? + | | | | ts:public-key-bag-r\ + \ef + | | | +--rw psks! {psk-auth}? | | +--rw hello-params | | | {tls-server-hello-params-config\ \}? | | | +--rw tls-versions | | | | +--rw tls-version* identityref | | | +--rw cipher-suites | | | +--rw cipher-suite* identityref | | +--rw keepalives! | | {tls-server-keepalives}? | | +--rw max-wait? uint16 @@ -4394,20 +4647,24 @@ B.17. 16 to 17 o Updated examples to include the "*-key-format" nodes. o Updated examples to remove the "required" nodes. o Updated examples to remove the "client-auth-defined-elsewhere" nodes. +B.18. 17 to 18 + + o Updated examples to reflect new "bag" addition to truststore. + Acknowledgements The authors would like to thank for following for lively discussions on list and in the halls (ordered by last name): Andy Bierman, Martin Bjorklund, Benoit Claise, Ramkumar Dhanapal, Mehmet Ersue, Balazs Kovacs, David Lamparter, Alan Luchuk, Ladislav Lhotka, Radek Krejci, Tom Petch, Juergen Schoenwaelder, Phil Shafer, Sean Turner, and Bert Wijnen. Author's Address