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

This html diff was produced by rfcdiff 1.47. The latest version is available from http://tools.ietf.org/tools/rfcdiff/