draft-ietf-netconf-netconf-client-server-18.txt   draft-ietf-netconf-netconf-client-server-19.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Watsen Networks Internet-Draft Watsen Networks
Intended status: Standards Track March 8, 2020 Intended status: Standards Track May 20, 2020
Expires: September 9, 2020 Expires: November 21, 2020
NETCONF Client and Server Models NETCONF Client and Server Models
draft-ietf-netconf-netconf-client-server-18 draft-ietf-netconf-netconf-client-server-19
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)
This draft contains many placeholder values that need to be replaced This draft contains placeholder values that need to be replaced with
with finalized values at the time of publication. This note finalized values at the time of publication. This note summarizes
summarizes all of the substitutions that are needed. No other RFC all of the substitutions that are needed. No other RFC Editor
Editor instructions are specified elsewhere in this document. instructions are specified elsewhere in this document.
This document contains references to other drafts in progress, both
in the Normative References section, as well as in body text
throughout. Please update the following references to reflect their
final RFC assignments:
o I-D.ietf-netconf-keystore
o I-D.ietf-netconf-tcp-client-server Artwork in this document contains shorthand references to drafts in
progress. Please apply the following replacements (note: not all may
be present):
o I-D.ietf-netconf-ssh-client-server o "AAAA" --> the assigned RFC value for draft-ietf-netconf-crypto-
types
o I-D.ietf-netconf-tls-client-server o "BBBB" --> the assigned RFC value for draft-ietf-netconf-trust-
anchors
Artwork in this document contains shorthand references to drafts in o "CCCC" --> the assigned RFC value for draft-ietf-netconf-keystore
progress. Please apply the following replacements:
o "XXXX" --> the assigned RFC value for this draft o "DDDD" --> the assigned RFC value for draft-ietf-netconf-tcp-
client-server
o "AAAA" --> the assigned RFC value for I-D.ietf-netconf-tcp-client- o "EEEE" --> the assigned RFC value for draft-ietf-netconf-ssh-
server client-server
o "YYYY" --> the assigned RFC value for I-D.ietf-netconf-ssh-client- o "FFFF" --> the assigned RFC value for draft-ietf-netconf-tls-
server client-server
o "ZZZZ" --> the assigned RFC value for I-D.ietf-netconf-tls-client- o "GGGG" --> the assigned RFC value for draft-ietf-netconf-http-
server client-server
o "HHHH" --> the assigned RFC value for this draft
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 "2020-03-08" --> the publication date of this draft o "2020-05-20" --> 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
Note to Reviewers (To be removed by RFC Editor)
This document presents a YANG module or modules that is/are part of a
collection of drafts that work together to produce the ultimate goal
of the NETCONF WG: to define configuration modules for NETCONF client
and servers, and RESTCONF client and servers.
The relationship between the various drafts in the collection is
presented in the below diagram.
crypto-types
^ ^
/ \
/ \
trust-anchors keystore
^ ^ ^ ^
| +---------+ | |
| | | |
| +------------+ |
tcp-client-server | / | |
^ ^ ssh-client-server | |
| | ^ tls-client-server
| | | ^ ^ http-client-server
| | | | | ^
| | | +-----+ +---------+ |
| | | | | |
| +-----------|--------|--------------+ | |
| | | | | |
+-----------+ | | | | |
| | | | | |
| | | | | |
netconf-client-server restconf-client-server
Full draft names and link to drafts:
o draft-ietf-netconf-crypto-types (html [1])
o draft-ietf-netconf-trust-anchors (html [2])
o draft-ietf-netconf-keystore (html [3])
o draft-ietf-netconf-tcp-client-server (html [4])
o draft-ietf-netconf-ssh-client-server (html [5])
o draft-ietf-netconf-tls-client-server (html [6])
o draft-ietf-netconf-http-client-server (html [7])
o draft-ietf-netconf-netconf-client-server (html [8])
o draft-ietf-netconf-restconf-client-server (html [9])
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 September 9, 2020. This Internet-Draft will expire on November 21, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2020 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 . . . . . . . . . . . . . . . . . . . . . . . . 4 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 5
2. Terminology . . . . . . . . . . . . . . . . . . . . . . . . . 4 2. Terminology . . . . . . . . . . . . . . . . . . . . . . . . . 5
3. The NETCONF Client Model . . . . . . . . . . . . . . . . . . 4 3. The NETCONF Client Model . . . . . . . . . . . . . . . . . . 5
3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 5
3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 6 3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 7
3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9 3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 11
4. The NETCONF Server Model . . . . . . . . . . . . . . . . . . 20 4. The NETCONF Server Model . . . . . . . . . . . . . . . . . . 22
4.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 20 4.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 22
4.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 22 4.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 24
4.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 29 4.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 31
5. Security Considerations . . . . . . . . . . . . . . . . . . . 41 5. Security Considerations . . . . . . . . . . . . . . . . . . . 43
6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 42 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 44
6.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 42 6.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 44
6.2. The YANG Module Names Registry . . . . . . . . . . . . . 42 6.2. The YANG Module Names Registry . . . . . . . . . . . . . 44
7. References . . . . . . . . . . . . . . . . . . . . . . . . . 43 7. References . . . . . . . . . . . . . . . . . . . . . . . . . 45
7.1. Normative References . . . . . . . . . . . . . . . . . . 43 7.1. Normative References . . . . . . . . . . . . . . . . . . 45
7.2. Informative References . . . . . . . . . . . . . . . . . 44 7.2. Informative References . . . . . . . . . . . . . . . . . 46
Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 45 7.3. URIs . . . . . . . . . . . . . . . . . . . . . . . . . . 47
A.1. Expanded Tree Diagram for 'ietf-netconf-client' . . . . . 45 Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 48
A.2. Expanded Tree Diagram for 'ietf-netconf-server' . . . . . 69 A.1. Expanded Tree Diagram for 'ietf-netconf-client' . . . . . 48
A.2. Expanded Tree Diagram for 'ietf-netconf-server' . . . . . 70
Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 94 Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 94
B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 94 B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 94
B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 94 B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 94
B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 94 B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 94
B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 94 B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 94
B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 95 B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 95
B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 95 B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 95
B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 95 B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 95
B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 95 B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 95
B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 95 B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 95
B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 96 B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 96
B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 96 B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 96
B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 96 B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 96
B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 97 B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 97
B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 97 B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 97
B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 97 B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 97
B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 97 B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 97
B.17. 16 to 17 . . . . . . . . . . . . . . . . . . . . . . . . 97 B.17. 16 to 17 . . . . . . . . . . . . . . . . . . . . . . . . 97
B.18. 17 to 18 . . . . . . . . . . . . . . . . . . . . . . . . 97 B.18. 17 to 18 . . . . . . . . . . . . . . . . . . . . . . . . 97
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 97 B.19. 18 to 19 . . . . . . . . . . . . . . . . . . . . . . . . 97
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 98
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 98 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].
skipping to change at page 6, line 48 skipping to change at page 7, line 48
<idle-time>15</idle-time> <idle-time>15</idle-time>
<max-probes>3</max-probes> <max-probes>3</max-probes>
<probe-interval>30</probe-interval> <probe-interval>30</probe-interval>
</keepalives> </keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<ssh-client-parameters> <ssh-client-parameters>
<client-identity> <client-identity>
<username>foobar</username> <username>foobar</username>
<public-key> <public-key>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm>
<public-key-format>ct:ssh-public-key-format</pub\ <public-key-format>ct:ssh-public-key-format</pub\
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>trusted-server-ca-certs</tru\ <truststore-reference>trusted-server-ca-certs</tru\
ststore-reference> ststore-reference>
</ca-certs> </ca-certs>
skipping to change at page 7, line 15 skipping to change at page 8, line 15
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>trusted-server-ca-certs</tru\ <truststore-reference>trusted-server-ca-certs</tru\
ststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<server-certs> <ee-certs>
<truststore-reference>trusted-server-ee-certs</tru\ <truststore-reference>trusted-server-ee-certs</tru\
ststore-reference> ststore-reference>
</server-certs> </ee-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>
</ssh> </ssh>
skipping to change at page 7, line 45 skipping to change at page 8, line 45
<keepalives> <keepalives>
<idle-time>15</idle-time> <idle-time>15</idle-time>
<max-probes>3</max-probes> <max-probes>3</max-probes>
<probe-interval>30</probe-interval> <probe-interval>30</probe-interval>
</keepalives> </keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<tls-client-parameters> <tls-client-parameters>
<client-identity> <client-identity>
<certificate> <certificate>
<local-definition> <local-definition>
<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>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs> <ca-certs>
<truststore-reference>trusted-server-ca-certs</tru\ <truststore-reference>trusted-server-ca-certs</tru\
ststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<server-certs> <ee-certs>
<truststore-reference>trusted-server-ee-certs</tru\ <truststore-reference>trusted-server-ee-certs</tru\
ststore-reference> ststore-reference>
</server-certs> </ee-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <test-peer-aliveness>
<max-attempts>3</max-attempts> <max-wait>30</max-wait>
<max-attempts>3</max-attempts>
</test-peer-aliveness>
</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>
</tls> </tls>
</endpoint> </endpoint>
</endpoints> </endpoints>
<connection-type> <connection-type>
<persistent/> <persistent/>
</connection-type> </connection-type>
<reconnect-strategy> <reconnect-strategy>
<start-with>last-connected</start-with> <start-with>last-connected</start-with>
</reconnect-strategy> </reconnect-strategy>
</netconf-server> </netconf-server>
</initiate> </initiate>
<!-- endpoints to listen for NETCONF Call Home connections on --> <!-- endpoints to listen for NETCONF Call Home connections on -->
<listen> <listen>
<endpoint> <endpoint>
<name>Intranet-facing listener</name> <name>Intranet-facing SSH listener</name>
<ssh> <ssh>
<tcp-server-parameters> <tcp-server-parameters>
<local-address>192.0.2.7</local-address> <local-address>192.0.2.7</local-address>
</tcp-server-parameters> </tcp-server-parameters>
<ssh-client-parameters> <ssh-client-parameters>
<client-identity> <client-identity>
<username>foobar</username> <username>foobar</username>
<public-key> <public-key>
<local-definition> <local-definition>
<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>
skipping to change at page 9, line 18 skipping to change at page 10, line 18
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>trusted-server-ca-certs</trustst\ <truststore-reference>trusted-server-ca-certs</trustst\
ore-reference> ore-reference>
</ca-certs> </ca-certs>
<server-certs> <ee-certs>
<truststore-reference>trusted-server-ee-certs</trustst\ <truststore-reference>trusted-server-ee-certs</trustst\
ore-reference> ore-reference>
</server-certs> </ee-certs>
<ssh-host-keys> <ssh-host-keys>
<truststore-reference>trusted-ssh-public-keys</trustst\ <truststore-reference>trusted-ssh-public-keys</trustst\
ore-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>
<endpoint>
<name>Intranet-facing TLS listener</name>
<tls>
<tcp-server-parameters>
<local-address>192.0.2.7</local-address>
</tcp-server-parameters>
<tls-client-parameters>
<client-identity>
<certificate>
<local-definition>
<public-key-format>ct:subject-public-key-info-format\
</public-key-format>
<public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</priva\
te-key-format>
<private-key>base64encodedvalue==</private-key>
<cert>base64encodedvalue==</cert>
</local-definition>
</certificate>
</client-identity>
<server-authentication>
<ca-certs>
<truststore-reference>trusted-server-ca-certs</trustst\
ore-reference>
</ca-certs>
<ee-certs>
<truststore-reference>trusted-server-ee-certs</trustst\
ore-reference>
</ee-certs>
</server-authentication>
<keepalives>
<peer-allowed-to-send/>
</keepalives>
</tls-client-parameters>
<netconf-client-parameters>
<!-- nothing to configure -->
</netconf-client-parameters>
</tls>
</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@2020-03-08.yang" <CODE BEGINS> file "ietf-netconf-client@2020-05-20.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";
} }
import ietf-tcp-client { import ietf-tcp-client {
prefix tcpc; prefix tcpc;
reference reference
"RFC BBBB: YANG Groupings for TCP Clients and TCP Servers"; "RFC DDDD: YANG Groupings for TCP Clients and TCP Servers";
} }
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 DDDD: YANG Groupings for TCP Clients and TCP Servers";
} }
import ietf-ssh-client { import ietf-ssh-client {
prefix sshc; prefix sshc;
revision-date 2020-03-08; // stable grouping definitions revision-date 2020-05-20; // stable grouping definitions
reference reference
"RFC CCCC: YANG Groupings for SSH Clients and SSH Servers"; "RFC EEEE: YANG Groupings for SSH Clients and SSH Servers";
} }
import ietf-tls-client { import ietf-tls-client {
prefix tlsc; prefix tlsc;
revision-date 2020-03-08; // stable grouping definitions revision-date 2020-05-20; // stable grouping definitions
reference reference
"RFC DDDD: YANG Groupings for TLS Clients and TLS Servers"; "RFC FFFF: 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>
Author: Kent Watsen <mailto:kent+ietf@watsen.net> Author: Kent Watsen <mailto:kent+ietf@watsen.net>
Author: Gary Wu <mailto:garywu@cisco.com>"; Author: Gary Wu <mailto:garywu@cisco.com>";
description description
"This module contains a collection of YANG definitions "This module contains a collection of YANG definitions
for configuring NETCONF clients. for configuring NETCONF clients.
Copyright (c) 2019 IETF Trust and the persons identified Copyright (c) 2020 IETF Trust and the persons identified
as authors of the code. All rights reserved. as authors of the code. All rights reserved.
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 HHHH
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcHHHH); 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 2020-03-08 { revision 2020-05-20 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: NETCONF Client and Server Models"; "RFC HHHH: NETCONF Client and Server Models";
} }
// Features // Features
feature ssh-initiate { feature ssh-initiate {
description description
"The 'ssh-initiate' feature indicates that the NETCONF client "The 'ssh-initiate' feature indicates that the NETCONF client
supports initiating SSH connections to NETCONF servers."; supports initiating SSH connections to NETCONF servers.";
reference reference
"RFC 6242: "RFC 6242:
skipping to change at page 14, line 14 skipping to change at page 16, line 4
to avoid name collisions."; to avoid name collisions.";
uses tlsc:tls-client-grouping; uses tlsc:tls-client-grouping;
} }
container netconf-client-parameters { container netconf-client-parameters {
description description
"A wrapper around the NETCONF client parameters "A wrapper around the NETCONF client parameters
to avoid name collisions."; to avoid name collisions.";
uses ncc:netconf-client-grouping; uses ncc:netconf-client-grouping;
} }
} }
} }
} }
} // netconf-client-initiate-stack-grouping } // netconf-client-initiate-stack-grouping
grouping netconf-client-listen-stack-grouping { grouping netconf-client-listen-stack-grouping {
description description
"A reusable grouping for configuring a NETCONF client "A reusable grouping for configuring a NETCONF client
'listen' protocol stack for a single connection."; 'listen' protocol stack for a single connection. The
'listen' stack supports call home connections, as
described in RFC 8071";
reference
"RFC 8071: NETCONF Call Home and RESTCONF Call Home";
choice transport { choice transport {
mandatory true; mandatory true;
description description
"Selects between available transports."; "Selects between available transports.";
case ssh { case ssh {
if-feature "ssh-listen"; if-feature "ssh-listen";
container ssh { container ssh {
description description
"SSH-specific listening configuration for inbound "SSH-specific listening configuration for inbound
connections."; connections.";
skipping to change at page 19, line 38 skipping to change at page 21, line 32
to the next endpoint in the list (round robin)."; to the next endpoint in the list (round robin).";
} }
} }
} // netconf-server } // netconf-server
} // initiate } // initiate
container listen { container listen {
if-feature "ssh-listen or tls-listen"; if-feature "ssh-listen or tls-listen";
presence "Enables client to accept call-home connections"; presence "Enables client to accept call-home connections";
description description
"Configures client accepting call-home TCP connections."; "Configures the client to accept call-home TCP connections.";
leaf idle-timeout { leaf idle-timeout {
type uint16; type uint16;
units "seconds"; units "seconds";
default "3600"; // one hour default "3600"; // one hour
description description
"Specifies the maximum number of seconds that a NETCONF "Specifies the maximum number of seconds that a NETCONF
session may remain idle. A NETCONF session will be session may remain idle. A NETCONF session will be
dropped if it is idle for an interval longer than this dropped if it is idle for an interval longer than this
number of seconds. If set to zero, then the server number of seconds. If set to zero, then the server
will never drop a session because it is idle. Sessions will never drop a session because it is idle. Sessions
skipping to change at page 20, line 19 skipping to change at page 22, line 13
leaf name { leaf name {
type string; type string;
description description
"An arbitrary name for the NETCONF listen endpoint."; "An arbitrary name for the NETCONF listen endpoint.";
} }
uses netconf-client-listen-stack-grouping; uses netconf-client-listen-stack-grouping;
} // endpoint } // endpoint
} // listen } // listen
} // netconf-client-app-grouping } // netconf-client-app-grouping
// Protocol accessible node, for servers that implement this // Protocol accessible node, for servers that implement
// module. // this module.
container netconf-client { container netconf-client {
uses netconf-client-app-grouping; uses netconf-client-app-grouping;
description description
"Top-level container for NETCONF client configuration."; "Top-level container for NETCONF client configuration.";
} }
} }
<CODE ENDS> <CODE ENDS>
4. The NETCONF Server Model 4. The NETCONF Server Model
skipping to change at page 23, line 10 skipping to change at page 25, line 4
<ssh> <ssh>
<tcp-server-parameters> <tcp-server-parameters>
<local-address>192.0.2.7</local-address> <local-address>192.0.2.7</local-address>
</tcp-server-parameters> </tcp-server-parameters>
<ssh-server-parameters> <ssh-server-parameters>
<server-identity> <server-identity>
<host-key> <host-key>
<name>deployment-specific-certificate</name> <name>deployment-specific-certificate</name>
<public-key> <public-key>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm>
<public-key-format>ct:ssh-public-key-format</publi\ <public-key-format>ct:ssh-public-key-format</publi\
c-key-format> c-key-format>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</pri\ <private-key-format>ct:rsa-private-key-format</pri\
vate-key-format> vate-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
</local-definition> </local-definition>
</public-key> </public-key>
</host-key> </host-key>
</server-identity> </server-identity>
skipping to change at page 23, line 42 skipping to change at page 25, line 35
<endpoint> <!-- listening for TLS sessions --> <endpoint> <!-- listening for TLS sessions -->
<name>netconf/tls</name> <name>netconf/tls</name>
<tls> <tls>
<tcp-server-parameters> <tcp-server-parameters>
<local-address>192.0.2.7</local-address> <local-address>192.0.2.7</local-address>
</tcp-server-parameters> </tcp-server-parameters>
<tls-server-parameters> <tls-server-parameters>
<server-identity> <server-identity>
<certificate> <certificate>
<local-definition> <local-definition>
<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>trusted-client-ca-certs</trustst\ <truststore-reference>trusted-client-ca-certs</trustst\
ore-reference> ore-reference>
</ca-certs> </ca-certs>
<client-certs> <ee-certs>
<truststore-reference>trusted-client-ee-certs</trustst\ <truststore-reference>trusted-client-ee-certs</trustst\
ore-reference> ore-reference>
</client-certs> </ee-certs>
</client-authentication> </client-authentication>
<keepalives>
<peer-allowed-to-send/>
</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>
<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>
</cert-to-name> </cert-to-name>
<cert-to-name> <cert-to-name>
skipping to change at page 24, line 46 skipping to change at page 26, line 41
<call-home> <call-home>
<netconf-client> <!-- SSH-based client --> <netconf-client> <!-- SSH-based client -->
<name>config-mgr</name> <name>config-mgr</name>
<endpoints> <endpoints>
<endpoint> <endpoint>
<name>east-data-center</name> <name>east-data-center</name>
<ssh> <ssh>
<tcp-client-parameters> <tcp-client-parameters>
<remote-address>east.config-mgr.example.com</remote-ad\ <remote-address>east.config-mgr.example.com</remote-ad\
dress> dress>
<keepalives>
<idle-time>15</idle-time>
<max-probes>3</max-probes>
<probe-interval>30</probe-interval>
</keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<ssh-server-parameters> <ssh-server-parameters>
<server-identity> <server-identity>
<host-key> <host-key>
<name>deployment-specific-certificate</name> <name>deployment-specific-certificate</name>
<public-key> <public-key>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm>
<public-key-format>ct:ssh-public-key-format</p\ <public-key-format>ct:ssh-public-key-format</p\
ublic-key-format> ublic-key-format>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format<\ <private-key-format>ct:rsa-private-key-format<\
/private-key-format> /private-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
</local-definition> </local-definition>
</public-key> </public-key>
</host-key> </host-key>
</server-identity> </server-identity>
skipping to change at page 25, line 39 skipping to change at page 27, line 38
<tcp-client-parameters> <tcp-client-parameters>
<remote-address>west.config-mgr.example.com</remote-ad\ <remote-address>west.config-mgr.example.com</remote-ad\
dress> dress>
</tcp-client-parameters> </tcp-client-parameters>
<ssh-server-parameters> <ssh-server-parameters>
<server-identity> <server-identity>
<host-key> <host-key>
<name>deployment-specific-certificate</name> <name>deployment-specific-certificate</name>
<public-key> <public-key>
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm>
<public-key-format>ct:ssh-public-key-format</p\ <public-key-format>ct:ssh-public-key-format</p\
ublic-key-format> ublic-key-format>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format<\ <private-key-format>ct:rsa-private-key-format<\
/private-key-format> /private-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
</local-definition> </local-definition>
</public-key> </public-key>
</host-key> </host-key>
</server-identity> </server-identity>
skipping to change at page 26, line 44 skipping to change at page 28, line 43
<keepalives> <keepalives>
<idle-time>15</idle-time> <idle-time>15</idle-time>
<max-probes>3</max-probes> <max-probes>3</max-probes>
<probe-interval>30</probe-interval> <probe-interval>30</probe-interval>
</keepalives> </keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<tls-server-parameters> <tls-server-parameters>
<server-identity> <server-identity>
<certificate> <certificate>
<local-definition> <local-definition>
<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>trusted-client-ca-certs</tru\ <truststore-reference>trusted-client-ca-certs</tru\
ststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<client-certs> <ee-certs>
<truststore-reference>trusted-client-ee-certs</tru\ <truststore-reference>trusted-client-ee-certs</tru\
ststore-reference> ststore-reference>
</client-certs> </ee-certs>
</client-authentication> </client-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <test-peer-aliveness>
<max-attempts>3</max-attempts> <max-wait>30</max-wait>
<max-attempts>3</max-attempts>
</test-peer-aliveness>
</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>
<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>
</cert-to-name> </cert-to-name>
skipping to change at page 28, line 6 skipping to change at page 30, line 5
<keepalives> <keepalives>
<idle-time>15</idle-time> <idle-time>15</idle-time>
<max-probes>3</max-probes> <max-probes>3</max-probes>
<probe-interval>30</probe-interval> <probe-interval>30</probe-interval>
</keepalives> </keepalives>
</tcp-client-parameters> </tcp-client-parameters>
<tls-server-parameters> <tls-server-parameters>
<server-identity> <server-identity>
<certificate> <certificate>
<local-definition> <local-definition>
<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>trusted-client-ca-certs</tru\ <truststore-reference>trusted-client-ca-certs</tru\
ststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<client-certs> <ee-certs>
<truststore-reference>trusted-client-ee-certs</tru\ <truststore-reference>trusted-client-ee-certs</tru\
ststore-reference> ststore-reference>
</client-certs> </ee-certs>
</client-authentication> </client-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <test-peer-aliveness>
<max-attempts>3</max-attempts> <max-wait>30</max-wait>
<max-attempts>3</max-attempts>
</test-peer-aliveness>
</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>
<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>
</cert-to-name> </cert-to-name>
skipping to change at page 29, line 20 skipping to change at page 31, 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@2020-03-08.yang" <CODE BEGINS> file "ietf-netconf-server@2020-05-20.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 42 skipping to change at page 31, line 42
import ietf-x509-cert-to-name { import ietf-x509-cert-to-name {
prefix x509c2n; prefix x509c2n;
reference reference
"RFC 7407: A YANG Data Model for SNMP Configuration"; "RFC 7407: A YANG Data Model for SNMP Configuration";
} }
import ietf-tcp-client { import ietf-tcp-client {
prefix tcpc; prefix tcpc;
reference reference
"RFC BBBB: YANG Groupings for TCP Clients and TCP Servers"; "RFC DDDD: YANG Groupings for TCP Clients and TCP Servers";
} }
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 DDDD: YANG Groupings for TCP Clients and TCP Servers";
} }
import ietf-ssh-common { import ietf-ssh-common {
prefix sshcmn; prefix sshcmn;
revision-date 2020-03-08; // stable grouping definitions revision-date 2020-05-20; // stable grouping definitions
reference reference
"RFC CCCC: YANG Groupings for SSH Clients and SSH Servers"; "RFC EEEE: YANG Groupings for SSH Clients and SSH Servers";
} }
import ietf-ssh-server { import ietf-ssh-server {
prefix sshs; prefix sshs;
revision-date 2020-03-08; // stable grouping definitions revision-date 2020-05-20; // stable grouping definitions
reference reference
"RFC CCCC: YANG Groupings for SSH Clients and SSH Servers"; "RFC EEEE: YANG Groupings for SSH Clients and SSH Servers";
} }
import ietf-tls-server { import ietf-tls-server {
prefix tlss; prefix tlss;
revision-date 2020-03-08; // stable grouping definitions revision-date 2020-05-20; // stable grouping definitions
reference reference
"RFC DDDD: YANG Groupings for TLS Clients and TLS Servers"; "RFC FFFF: 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>
Author: Kent Watsen <mailto:kent+ietf@watsen.net> Author: Kent Watsen <mailto:kent+ietf@watsen.net>
Author: Gary Wu <mailto:garywu@cisco.com> Author: Gary Wu <mailto:garywu@cisco.com>
Author: Juergen Schoenwaelder Author: Juergen Schoenwaelder
<mailto:j.schoenwaelder@jacobs-university.de>"; <mailto:j.schoenwaelder@jacobs-university.de>";
description description
"This module contains a collection of YANG definitions "This module contains a collection of YANG definitions
for configuring NETCONF servers. for configuring NETCONF servers.
Copyright (c) 2019 IETF Trust and the persons identified Copyright (c) 2020 IETF Trust and the persons identified
as authors of the code. All rights reserved. as authors of the code. All rights reserved.
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 HHHH
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcHHHH); 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 2020-03-08 { revision 2020-05-20 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: NETCONF Client and Server Models"; "RFC HHHH: NETCONF Client and Server Models";
} }
// Features // Features
feature ssh-listen { feature ssh-listen {
description description
"The 'ssh-listen' feature indicates that the NETCONF server "The 'ssh-listen' feature indicates that the NETCONF server
supports opening a port to accept NETCONF over SSH supports opening a port to accept NETCONF over SSH
client connections."; client connections.";
reference reference
skipping to change at page 34, line 28 skipping to change at page 36, line 28
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 {
refine "client-authentication" { refine "client-authentication" {
must 'ca-certs or client-certs'; must 'ca-certs or ee-certs';
description description
"NETCONF/TLS servers MUST validate client "NETCONF/TLS servers MUST validate client
certificates."; certificates. This configures certificates
at the socket-level (i.e. bags), more
discriminating client-certificate checks
SHOULD be implemented by the application.";
reference
"RFC 7589:
Using the NETCONF Protocol over Transport Layer
Security (TLS) with Mutual X.509 Authentication";
} }
} }
} }
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 36, line 18 skipping to change at page 38, line 24
to the IANA-assigned well-known port for to the IANA-assigned well-known port for
'netconf-ch-tls' (4335) if no value is 'netconf-ch-tls' (4335) if no value is
specified."; 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 ee-certs';
description description
"NETCONF/TLS servers MUST validate client "NETCONF/TLS servers MUST validate client
certificates."; certificates. This configures certificates
at the socket-level (i.e. bags), more
discriminating client-certificate checks
SHOULD be implemented by the application.";
reference
"RFC 7589:
Using the NETCONF Protocol over Transport Layer
Security (TLS) with Mutual X.509 Authentication";
} }
}*/ }
} }
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 41, line 4 skipping to change at page 43, line 15
type uint8 { type uint8 {
range "1..max"; range "1..max";
} }
default "3"; default "3";
description description
"Specifies the number times the NETCONF server tries "Specifies the number times the NETCONF server tries
to connect to a specific endpoint before moving on to connect to a specific endpoint before moving on
to the next endpoint in the list (round robin)."; to the next endpoint in the list (round robin).";
} }
} // container reconnect-strategy } // container reconnect-strategy
} // list netconf-client } // list netconf-client
} // container call-home } // container call-home
} // grouping netconf-server-app-grouping } // grouping netconf-server-app-grouping
// Protocol accessible node, for servers that implement this // Protocol accessible node, for servers that implement
// module. // this module.
container netconf-server { container netconf-server {
uses netconf-server-app-grouping; uses netconf-server-app-grouping;
description description
"Top-level container for NETCONF server configuration."; "Top-level container for NETCONF server configuration.";
} }
} }
<CODE ENDS> <CODE ENDS>
5. Security Considerations 5. Security Considerations
skipping to change at page 42, line 44 skipping to change at page 45, line 8
6.2. The YANG Module Names Registry 6.2. The YANG Module Names Registry
This document registers two YANG modules in the YANG Module Names This document registers two YANG modules in the YANG Module Names
registry [RFC6020]. Following the format in [RFC6020], the the registry [RFC6020]. Following the format in [RFC6020], the the
following registrations are requested: following registrations are requested:
name: ietf-netconf-client name: ietf-netconf-client
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 HHHH
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 HHHH
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-15 (work in progress), November ietf-netconf-keystore-16 (work in progress), March 2020.
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-17 (work in progress), November 2019. server-18 (work in progress), March 2020.
[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-17 (work in progress), November 2019. server-18 (work in progress), March 2020.
[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 27 skipping to change at page 46, line 35
<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., "A YANG Data Model for a Truststore", draft- Watsen, K., "A YANG Data Model for a Truststore", draft-
ietf-netconf-trust-anchors-08 (work in progress), November ietf-netconf-trust-anchors-09 (work in progress), March
2019. 2020.
[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 5 skipping to change at page 47, line 10
[RFC8340] Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams", [RFC8340] Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams",
BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018, BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018,
<https://www.rfc-editor.org/info/rfc8340>. <https://www.rfc-editor.org/info/rfc8340>.
[RFC8341] Bierman, A. and M. Bjorklund, "Network Configuration [RFC8341] Bierman, A. and M. Bjorklund, "Network Configuration
Access Control Model", STD 91, RFC 8341, Access Control Model", STD 91, RFC 8341,
DOI 10.17487/RFC8341, March 2018, DOI 10.17487/RFC8341, March 2018,
<https://www.rfc-editor.org/info/rfc8341>. <https://www.rfc-editor.org/info/rfc8341>.
7.3. URIs
[1] https://tools.ietf.org/html/draft-ietf-netconf-crypto-types
[2] https://tools.ietf.org/html/draft-ietf-netconf-trust-anchors
[3] https://tools.ietf.org/html/draft-ietf-netconf-keystore
[4] https://tools.ietf.org/html/draft-ietf-netconf-tcp-client-server
[5] https://tools.ietf.org/html/draft-ietf-netconf-ssh-client-server
[6] https://tools.ietf.org/html/draft-ietf-netconf-tls-client-server
[7] https://tools.ietf.org/html/draft-ietf-netconf-http-client-server
[8] https://tools.ietf.org/html/draft-ietf-netconf-netconf-client-
server
[9] https://tools.ietf.org/html/draft-ietf-netconf-restconf-client-
server
Appendix A. Expanded Tree Diagrams Appendix A. Expanded Tree Diagrams
A.1. Expanded Tree Diagram for 'ietf-netconf-client' A.1. Expanded Tree Diagram for 'ietf-netconf-client'
The following tree diagram [RFC8340] provides an overview of the data The following tree diagram [RFC8340] provides an overview of the data
model for the "ietf-netconf-client" module. model for the "ietf-netconf-client" module.
This tree diagram shows all the nodes defined in this module, This tree diagram shows all the nodes defined in this module,
including those defined by "grouping" statements used by this module. including those defined by "grouping" statements used by this module.
skipping to change at page 45, line 45 skipping to change at page 48, line 45
| | | | | {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 ssh-client-parameters | | | +--rw ssh-client-parameters
| | | | +--rw client-identity | | | | +--rw client-identity
| | | | | +--rw username? string | | | | | +--rw username? string
| | | | | +--rw (auth-type) | | | | | +--rw public-key!
| | | | | +--:(public-key) | | | | | | {client-identity-publickey}?
| | | | | | +--rw public-key | | | | | | +--rw (local-or-keystore)
| | | | | | +--rw (local-or-keystore) | | | | | | +--:(local)
| | | | | | +--:(local) | | | | | | | {local-definitions-su\
| | | | | | | {local-definiti\ \pported}?
\ons-supported}? | | | | | | | +--rw local-definition
| | | | | | | +--rw local-definition | | | | | | | +--rw public-key-format
| | | | | | | +--rw algorithm | | | | | | | | identityref
| | | | | | | | iasa:asymm\ | | | | | | | +--rw public-key
\etric-algorithm-type | | | | | | | | binary
| | | | | | | +--rw public-key-f\ | | | | | | | +--rw private-key-format?
\ormat | | | | | | | | identityref
| | | | | | | | identityref | | | | | | | +--rw (private-key-type)
| | | | | | | +--rw public-key | | | | | | | +--:(private-key)
| | | | | | | | binary | | | | | | | | +--rw private-key?
| | | | | | | +--rw private-key-\ | | | | | | | | binary
\format? | | | | | | | +--:(hidden-private-k\
| | | | | | | | identityref \ey)
| | | | | | | +--rw (private-key\ | | | | | | | | +--rw hidden-priva\
\-type) \te-key?
| | | | | | | +--:(private-ke\ | | | | | | | | empty
\y) | | | | | | | +--:(encrypted-privat\
| | | | | | | | +--rw privat\ \e-key)
\e-key? | | | | | | | +--rw encrypted-pr\
| | | | | | | | bina\ \ivate-key
\ry | | | | | | | +--rw (key-type)
| | | | | | | +--:(hidden-pri\ | | | | | | | | +--:(symmetr\
\vate-key) \ic-key-ref)
| | | | | | | | +--rw hidden\ | | | | | | | | | +--rw sym\
\-private-key? \metric-key-ref? leafref
| | | | | | | | empty | | | | | | | | | {\
| | | | | | | +--:(encrypted-\ \keystore-supported}?
\private-key) | | | | | | | | +--:(asymmet\
| | | | | | | +--rw encryp\ \ric-key-ref)
\ted-private-key | | | | | | | | +--rw asy\
| | | | | | | +--rw (ke\ \mmetric-key-ref? leafref
\y-type) | | | | | | | | {\
| | | | | | | | +--:(s\ \keystore-supported}?
\ymmetric-key-ref) | | | | | | | +--rw value?
| | | | | | | | | +--\ | | | | | | | binary
\rw symmetric-key-ref? leafref | | | | | | +--:(keystore)
| | | | | | | | | \ | | | | | | {keystore-supported}?
\ {keystore-supported}? | | | | | | +--rw keystore-reference?
| | | | | | | | +--:(a\ | | | | | | ks:asymmetric-key-r\
\symmetric-key-ref) \ef
| | | | | | | | +--\ | | | | | +--rw password? string
\rw asymmetric-key-ref? leafref | | | | | | {client-identity-password}?
| | | | | | | | \ | | | | | +--rw hostbased!
\ {keystore-supported}? | | | | | | {client-identity-hostbased}?
| | | | | | | +--rw val\ | | | | | | +--rw (local-or-keystore)
\ue? | | | | | | +--:(local)
| | | | | | | b\ | | | | | | | {local-definitions-su\
\inary \pported}?
| | | | | | +--:(keystore) | | | | | | | +--rw local-definition
| | | | | | {keystore-suppo\ | | | | | | | +--rw public-key-format
\rted}? | | | | | | | | identityref
| | | | | | +--rw keystore-refere\ | | | | | | | +--rw public-key
\nce? | | | | | | | | binary
| | | | | | ks:asymmetric\ | | | | | | | +--rw private-key-format?
\-key-ref | | | | | | | | identityref
| | | | | +--:(password) | | | | | | | +--rw (private-key-type)
| | | | | | +--rw password? string | | | | | | | +--:(private-key)
| | | | | | {client-identity-passw\ | | | | | | | | +--rw private-key?
\ord}? | | | | | | | | binary
| | | | | +--:(hostbased) | | | | | | | +--:(hidden-private-k\
| | | | | | +--rw hostbased \ey)
| | | | | | {client-identity-hostb\ | | | | | | | | +--rw hidden-priva\
\ased}? \te-key?
| | | | | | +--rw (local-or-keystore) | | | | | | | | empty
| | | | | | +--:(local) | | | | | | | +--:(encrypted-privat\
| | | | | | | {local-definiti\ \e-key)
\ons-supported}? | | | | | | | +--rw encrypted-pr\
| | | | | | | +--rw local-definition \ivate-key
| | | | | | | +--rw algorithm | | | | | | | +--rw (key-type)
| | | | | | | | iasa:asymm\ | | | | | | | | +--:(symmetr\
\etric-algorithm-type \ic-key-ref)
| | | | | | | +--rw public-key-f\ | | | | | | | | | +--rw sym\
\ormat \metric-key-ref? leafref
| | | | | | | | identityref | | | | | | | | | {\
| | | | | | | +--rw public-key \keystore-supported}?
| | | | | | | | binary | | | | | | | | +--:(asymmet\
| | | | | | | +--rw private-key-\ \ric-key-ref)
\format? | | | | | | | | +--rw asy\
| | | | | | | | identityref \mmetric-key-ref? leafref
| | | | | | | +--rw (private-key\ | | | | | | | | {\
\-type) \keystore-supported}?
| | | | | | | +--:(private-ke\ | | | | | | | +--rw value?
\y) | | | | | | | binary
| | | | | | | | +--rw privat\ | | | | | | +--:(keystore)
\e-key? | | | | | | {keystore-supported}?
| | | | | | | | bina\ | | | | | | +--rw keystore-reference?
\ry | | | | | | ks:asymmetric-key-r\
| | | | | | | +--:(hidden-pri\ \ef
\vate-key) | | | | | +--rw none? empty
| | | | | | | | +--rw hidden\ | | | | | | {client-identity-none}?
\-private-key? | | | | | +--rw certificate!
| | | | | | | | empty | | | | | {sshcmn:ssh-x509-certs}?
| | | | | | | +--:(encrypted-\ | | | | | +--rw (local-or-keystore)
\private-key) | | | | | +--:(local)
| | | | | | | +--rw encryp\ | | | | | | {local-definitions-su\
\ted-private-key \pported}?
| | | | | | | +--rw (ke\ | | | | | | +--rw local-definition
| | | | | | +--rw public-key-format
\y-type) | | | | | | | identityref
| | | | | | | | +--:(s\ | | | | | | +--rw public-key
\ymmetric-key-ref) | | | | | | | binary
| | | | | | | | | +--\ | | | | | | +--rw private-key-format?
\rw symmetric-key-ref? leafref | | | | | | | identityref
| | | | | | | | | \ | | | | | | +--rw (private-key-type)
\ {keystore-supported}? | | | | | | | +--:(private-key)
| | | | | | | | +--:(a\ | | | | | | | | +--rw private-key?
\symmetric-key-ref) | | | | | | | | binary
| | | | | | | | +--\ | | | | | | | +--:(hidden-private-k\
\rw asymmetric-key-ref? leafref \ey)
| | | | | | | | \ | | | | | | | | +--rw hidden-priva\
\ {keystore-supported}? \te-key?
| | | | | | | +--rw val\ | | | | | | | | empty
\ue? | | | | | | | +--:(encrypted-privat\
| | | | | | | b\ \e-key)
\inary | | | | | | | +--rw encrypted-pr\
| | | | | | +--:(keystore) \ivate-key
| | | | | | {keystore-suppo\ | | | | | | | +--rw (key-type)
\rted}? | | | | | | | | +--:(symmetr\
| | | | | | +--rw keystore-refere\ \ic-key-ref)
\nce? | | | | | | | | | +--rw sym\
| | | | | | ks:asymmetric\ \metric-key-ref? leafref
\-key-ref | | | | | | | | | {\
| | | | | +--:(none) \keystore-supported}?
| | | | | | +--rw none? empty | | | | | | | | +--:(asymmet\
| | | | | | {client-identity-none}? \ric-key-ref)
| | | | | +--:(certificate) | | | | | | | | +--rw asy\
| | | | | +--rw certificate \mmetric-key-ref? leafref
| | | | | {sshcmn:ssh-x509-certs\ | | | | | | | | {\
\}? \keystore-supported}?
| | | | | +--rw (local-or-keystore) | | | | | | | +--rw value?
| | | | | +--:(local) | | | | | | | binary
| | | | | | {local-definiti\ | | | | | | +--rw cert?
\ons-supported}? | | | | | | | end-entity-cert-\
| | | | | | +--rw local-definition \cms
| | | | | | +--rw algorithm | | | | | | +---n certificate-expira\
| | | | | | | iasa:asymm\ \tion
\etric-algorithm-type | | | | | | | +-- expiration-date
| | | | | | +--rw public-key-f\ | | | | | | | yang:date-and\
\ormat \-time
| | | | | | | identityref | | | | | | +---x generate-certifica\
| | | | | | +--rw public-key \te-signing-request
| | | | | | | binary | | | | | | {certificate-sig\
| | | | | | +--rw private-key-\ \ning-request-generation}?
\format? | | | | | | +---w input
| | | | | | | identityref | | | | | | | +---w subject
| | | | | | +--rw (private-key\ | | | | | | | | binary
| | | | | | | +---w attributes?
\-type) | | | | | | | binary
| | | | | | | +--:(private-ke\ | | | | | | +--ro output
\y) | | | | | | +--ro certificate-\
| | | | | | | | +--rw privat\ \signing-request
\e-key? | | | | | | ct:csr
| | | | | | | | bina\ | | | | | +--:(keystore)
\ry | | | | | {keystore-supported}?
| | | | | | | +--:(hidden-pri\ | | | | | +--rw keystore-reference
\vate-key) | | | | | +--rw asymmetric-key?
| | | | | | | | +--rw hidden\ | | | | | | ks:asymmetric-ke\
\-private-key? \y-ref
| | | | | | | | empty | | | | | +--rw certificate? \
| | | | | | | +--:(encrypted-\ \leafref
\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
| | | | | | +--rw cert?
| | | | | | | end-entity\
\-cert-cms
| | | | | | +---n certificate-\
\expiration
| | | | | | | +-- expiration-\
\date
| | | | | | | yang:da\
\te-and-time
| | | | | | +---x generate-cer\
\tificate-signing-request
| | | | | | +---w input
| | | | | | | +---w subject
| | | | | | | | bina\
\ry
| | | | | | | +---w attrib\
\utes?
| | | | | | | bina\
\ry
| | | | | | +--ro output
| | | | | | +--ro certif\
\icate-signing-request
| | | | | | bina\
\ry
| | | | | +--:(keystore)
| | | | | {keystore-suppo\
\rted}?
| | | | | +--rw keystore-refere\
\nce
| | | | | +--rw asymmetric-k\
\ey?
| | | | | | ks:asymmet\
\ric-key-ref
| | | | | +--rw certificate?\
\ 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 public-key* [name] | | | | | | | +--rw public-key* [name]
| | | | | | | +--rw name | | | | | | | +--rw name
| | | | | | | | string | | | | | | | | string
| | | | | | | +--rw algorithm
| | | | | | | | iasa:asymmetr\
\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\
\,public-keys}? \,public-keys}?
| | | | | | +--rw truststore-reference? | | | | | | +--rw truststore-reference?
| | | | | | ts:public-key-bag-r\ | | | | | | ts:public-key-bag-r\
skipping to change at page 51, line 18 skipping to change at page 53, line 9
| | | | | | | +--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}? \,certificates}?
| | | | | | +--rw truststore-reference? | | | | | | +--rw truststore-reference?
| | | | | | ts:certificate-bag-\ | | | | | | ts:certificate-bag-\
\ref \ref
| | | | | +--rw server-certs! | | | | | +--rw ee-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}? \,certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificate-bag-\ | | | | | ts:certificate-bag-\
\ref \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*
skipping to change at page 52, line 38 skipping to change at page 54, line 29
| | | +--rw client-identity | | | +--rw client-identity
| | | | +--rw (auth-type)? | | | | +--rw (auth-type)?
| | | | +--:(certificate) | | | | +--:(certificate)
| | | | | {x509-certificate-auth}? | | | | | {x509-certificate-auth}?
| | | | | +--rw certificate | | | | | +--rw certificate
| | | | | +--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
| | | | | | | iasa:asymm\
\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)
skipping to change at page 53, line 48 skipping to change at page 55, line 35
| | | | | | | end-entity\ | | | | | | | end-entity\
\-cert-cms \-cert-cms
| | | | | | +---n certificate-\ | | | | | | +---n certificate-\
\expiration \expiration
| | | | | | | +-- expiration-\ | | | | | | | +-- expiration-\
\date \date
| | | | | | | yang:da\ | | | | | | | yang:da\
\te-and-time \te-and-time
| | | | | | +---x generate-cer\ | | | | | | +---x generate-cer\
\tificate-signing-request \tificate-signing-request
| | | | | | {certifica\
\te-signing-request-generation}?
| | | | | | +---w input | | | | | | +---w input
| | | | | | | +---w subject | | | | | | | +---w subject
| | | | | | | | bina\ | | | | | | | | bina\
\ry \ry
| | | | | | | +---w attrib\ | | | | | | | +---w attrib\
\utes? \utes?
| | | | | | | bina\ | | | | | | | bina\
\ry \ry
| | | | | | +--ro output | | | | | | +--ro output
| | | | | | +--ro certif\ | | | | | | +--ro certif\
\icate-signing-request \icate-signing-request
| | | | | | bina\ | | | | | | ct:c\
\ry \sr
| | | | | +--:(keystore) | | | | | +--:(keystore)
| | | | | {keystore-suppo\ | | | | | {keystore-suppo\
\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)
skipping to change at page 54, line 32 skipping to change at page 56, line 22
| | | | | +--rw certificate?\ | | | | | +--rw certificate?\
\ leafref \ leafref
| | | | +--:(raw-public-key) | | | | +--:(raw-public-key)
| | | | | {raw-public-key-auth}? | | | | | {raw-public-key-auth}?
| | | | | +--rw raw-private-key | | | | | +--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
| | | | | | | iasa:asymm\
\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)
skipping to change at page 55, line 43 skipping to change at page 57, line 30
\nce? \nce?
| | | | | ks:asymmetric\ | | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | | +--:(psk) {psk-auth}? | | | | +--:(psk) {psk-auth}?
| | | | +--rw psk | | | | +--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
| | | | | | isa:symmet\
\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\
skipping to change at page 57, line 4 skipping to change at page 58, line 37
| | | +--rw server-authentication | | | +--rw server-authentication
| | | | +--rw ca-certs! | | | | +--rw ca-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}? \,certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificate-bag-\ | | | | | ts:certificate-bag-\
\ref \ref
| | | | +--rw server-certs! | | | | +--rw ee-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}? \,certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificate-bag-\ | | | | | ts:certificate-bag-\
\ref \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 public-key* [name] | | | | | | +--rw public-key* [name]
| | | | | | +--rw name | | | | | | +--rw name
| | | | | | | string | | | | | | | string
| | | | | | +--rw algorithm
| | | | | | | iasa:asymmetr\
\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\
\,public-keys}? \,public-keys}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:public-key-bag-r\ | | | | | ts:public-key-bag-r\
\ef \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}?
| | | +--rw max-wait? uint16 | | | +--rw peer-allowed-to-send? empty
| | | +--rw max-attempts? uint8 | | | +--rw test-peer-aliveness!
| | | +--rw max-wait? uint16
| | | +--rw max-attempts? uint8
| | +--rw netconf-client-parameters | | +--rw netconf-client-parameters
| +--rw connection-type | +--rw connection-type
| | +--rw (connection-type) | | +--rw (connection-type)
| | +--:(persistent-connection) | | +--:(persistent-connection)
| | | +--rw persistent! | | | +--rw persistent!
| | +--:(periodic-connection) | | +--:(periodic-connection)
| | +--rw periodic! | | +--rw periodic!
| | +--rw period? uint16 | | +--rw period? uint16
| | +--rw anchor-time? yang:date-and-time | | +--rw anchor-time? yang:date-and-time
| | +--rw idle-timeout? uint16 | | +--rw idle-timeout? uint16
skipping to change at page 59, line 6 skipping to change at page 60, line 37
| +--rw ssh | +--rw ssh
| +--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 ssh-client-parameters | +--rw ssh-client-parameters
| | +--rw client-identity | | +--rw client-identity
| | | +--rw username? string | | | +--rw username? string
| | | +--rw (auth-type) | | | +--rw public-key!
| | | +--:(public-key) | | | | {client-identity-publickey}?
| | | | +--rw public-key | | | | +--rw (local-or-keystore)
| | | | +--rw (local-or-keystore) | | | | +--:(local)
| | | | +--:(local) | | | | | {local-definitions-supporte\
| | | | | {local-definitions-su\ \d}?
\pported}? | | | | | +--rw local-definition
| | | | | +--rw local-definition | | | | | +--rw public-key-format
| | | | | +--rw algorithm | | | | | | identityref
| | | | | | iasa:asymmetric-\ | | | | | +--rw public-key
\algorithm-type | | | | | | binary
| | | | | +--rw public-key-format | | | | | +--rw private-key-format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw (private-key-type)
| | | | | | binary | | | | | +--:(private-key)
| | | | | +--rw private-key-format? | | | | | | +--rw private-key?
| | | | | | identityref | | | | | | binary
| | | | | +--rw (private-key-type) | | | | | +--:(hidden-private-key)
| | | | | +--:(private-key) | | | | | | +--rw hidden-private-key?
| | | | | | +--rw private-key? | | | | | | empty
| | | | | | binary | | | | | +--:(encrypted-private-key)
| | | | | +--:(hidden-private-k\ | | | | | +--rw encrypted-private-\
\ey) \key
| | | | | | +--rw hidden-priva\ | | | | | +--rw (key-type)
\te-key? | | | | | | +--:(symmetric-key\
| | | | | | empty \-ref)
| | | | | +--:(encrypted-privat\ | | | | | | | +--rw symmetric\
\e-key) \-key-ref? leafref
| | | | | +--rw encrypted-pr\ | | | | | | | {keysto\
\ivate-key \re-supported}?
| | | | | +--rw (key-type) | | | | | | +--:(asymmetric-ke\
| | | | | | +--:(symmetr\ \y-ref)
\ic-key-ref) | | | | | | +--rw asymmetri\
| | | | | | | +--rw sym\ \c-key-ref? leafref
\metric-key-ref? leafref | | | | | | {keysto\
| | | | | | | {\ \re-supported}?
\keystore-supported}? | | | | | +--rw value?
| | | | | | +--:(asymmet\ | | | | | binary
\ric-key-ref) | | | | +--:(keystore) {keystore-supported}?
| | | | | | +--rw asy\ | | | | +--rw keystore-reference?
\mmetric-key-ref? leafref | | | | ks:asymmetric-key-ref
| | | | | | {\ | | | +--rw password? string
\keystore-supported}? | | | | {client-identity-password}?
| | | | | +--rw value? | | | +--rw hostbased!
| | | | | binary | | | | {client-identity-hostbased}?
| | | | +--:(keystore) | | | | +--rw (local-or-keystore)
| | | | {keystore-supported}? | | | | +--:(local)
| | | | +--rw keystore-reference? | | | | | {local-definitions-supporte\
| | | | ks:asymmetric-key-r\ \d}?
\ef | | | | | +--rw local-definition
| | | +--:(password) | | | | | +--rw public-key-format
| | | | +--rw password? string | | | | | | identityref
| | | | {client-identity-password}? | | | | | +--rw public-key
| | | +--:(hostbased) | | | | | | binary
| | | | +--rw hostbased | | | | | +--rw private-key-format?
| | | | {client-identity-hostbased}? | | | | | | identityref
| | | | +--rw (local-or-keystore) | | | | | +--rw (private-key-type)
| | | | +--:(local) | | | | | +--:(private-key)
| | | | | {local-definitions-su\ | | | | | | +--rw private-key?
\pported}? | | | | | | binary
| | | | | +--rw local-definition | | | | | +--:(hidden-private-key)
| | | | | +--rw algorithm | | | | | | +--rw hidden-private-key?
| | | | | | iasa:asymmetric-\ | | | | | | empty
\algorithm-type | | | | | +--:(encrypted-private-key)
| | | | | +--rw public-key-format | | | | | +--rw encrypted-private-\
| | | | | | identityref \key
| | | | | +--rw public-key | | | | | +--rw (key-type)
| | | | | | binary | | | | | | +--:(symmetric-key\
| | | | | +--rw private-key-format? \-ref)
| | | | | | identityref | | | | | | | +--rw symmetric\
| | | | | +--rw (private-key-type) \-key-ref? leafref
| | | | | +--:(private-key) | | | | | | | {keysto\
| | | | | | +--rw private-key? \re-supported}?
| | | | | | binary | | | | | | +--:(asymmetric-ke\
| | | | | +--:(hidden-private-k\ \y-ref)
\ey) | | | | | | +--rw asymmetri\
| | | | | | +--rw hidden-priva\ \c-key-ref? leafref
\te-key? | | | | | | {keysto\
| | | | | | empty \re-supported}?
| | | | | +--:(encrypted-privat\ | | | | | +--rw value?
\e-key) | | | | | binary
| | | | | +--rw encrypted-pr\ | | | | +--:(keystore) {keystore-supported}?
\ivate-key | | | | +--rw keystore-reference?
| | | | | +--rw (key-type) | | | | ks:asymmetric-key-ref
| | | | | | +--:(symmetr\ | | | +--rw none? empty
\ic-key-ref) | | | | {client-identity-none}?
| | | | | | | +--rw sym\ | | | +--rw certificate! {sshcmn:ssh-x509-certs}?
\metric-key-ref? leafref | | | +--rw (local-or-keystore)
| | | | | | | {\ | | | +--:(local)
\keystore-supported}? | | | | {local-definitions-supporte\
| | | | | | +--:(asymmet\ \d}?
\ric-key-ref) | | | | +--rw local-definition
| | | | | | +--rw asy\ | | | | +--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-key)
| | | | | | +--rw hidden-private-key?
| | | | | | empty
| | | | | +--:(encrypted-private-key)
| | | | | +--rw encrypted-private-\
\key
| | | | | +--rw (key-type)
| | | | | | +--:(symmetric-key\
\mmetric-key-ref? leafref \-ref)
| | | | | | {\ | | | | | | | +--rw symmetric\
\keystore-supported}? \-key-ref? leafref
| | | | | +--rw value? | | | | | | | {keysto\
| | | | | binary \re-supported}?
| | | | +--:(keystore) | | | | | | +--:(asymmetric-ke\
| | | | {keystore-supported}? \y-ref)
| | | | +--rw keystore-reference? | | | | | | +--rw asymmetri\
| | | | ks:asymmetric-key-r\ \c-key-ref? leafref
\ef | | | | | | {keysto\
| | | +--:(none) \re-supported}?
| | | | +--rw none? empty | | | | | +--rw value?
| | | | {client-identity-none}? | | | | | binary
| | | +--:(certificate) | | | | +--rw cert?
| | | +--rw certificate | | | | | end-entity-cert-cms
| | | {sshcmn:ssh-x509-certs}? | | | | +---n certificate-expiration
| | | +--rw (local-or-keystore) | | | | | +-- expiration-date
| | | +--:(local) | | | | | yang:date-and-time
| | | | {local-definitions-su\ | | | | +---x generate-certificate-sig\
\pported}? \ning-request
| | | | +--rw local-definition | | | | {certificate-signing-r\
| | | | +--rw algorithm \equest-generation}?
| | | | | iasa:asymmetric-\ | | | | +---w input
\algorithm-type | | | | | +---w subject
| | | | +--rw public-key-format | | | | | | binary
| | | | | identityref | | | | | +---w attributes?
| | | | +--rw public-key | | | | | binary
| | | | | binary | | | | +--ro output
| | | | +--rw private-key-format? | | | | +--ro certificate-signin\
| | | | | identityref \g-request
| | | | +--rw (private-key-type) | | | | ct:csr
| | | | | +--:(private-key) | | | +--:(keystore) {keystore-supported}?
| | | | | | +--rw private-key? | | | +--rw keystore-reference
| | | | | | binary | | | +--rw asymmetric-key?
| | | | | +--:(hidden-private-k\ | | | | ks:asymmetric-key-ref
\ey) | | | +--rw certificate? leafref
| | | | | | +--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
| | | | +--rw cert?
| | | | | end-entity-cert-\
\cms
| | | | +---n certificate-expira\
\tion
| | | | | +-- expiration-date
| | | | | yang:date-and\
\-time
| | | | +---x generate-certifica\
\te-signing-request
| | | | +---w input
| | | | | +---w subject
| | | | | | binary
| | | | | +---w attributes?
| | | | | binary
| | | | +--ro output
| | | | +--ro certificate-\
\signing-request
| | | | binary
| | | +--:(keystore)
| | | {keystore-supported}?
| | | +--rw keystore-reference
| | | +--rw asymmetric-key?
| | | | ks:asymmetric-ke\
\y-ref
| | | +--rw certificate? \
\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 public-key* [name] | | | | | +--rw public-key* [name]
| | | | | +--rw name | | | | | +--rw name
| | | | | | string | | | | | | string
| | | | | +--rw algorithm
| | | | | | iasa:asymmetric-alg\
\orithm-type
| | | | | +--rw public-key-format | | | | | +--rw public-key-format
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported,publi\ | | | | {truststore-supported,publi\
\c-keys}? \c-keys}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:public-key-bag-ref | | | | ts:public-key-bag-ref
| | | +--rw ca-certs! {sshcmn:ssh-x509-certs}? | | | +--rw ca-certs! {sshcmn:ssh-x509-certs}?
skipping to change at page 63, line 27 skipping to change at page 64, line 23
| | | | +--:(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,certi\
\certificates}? \ficates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-ref | | | | ts:certificate-bag-ref
| | | +--rw server-certs! | | | +--rw ee-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,certi\
\certificates}? \ficates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificate-bag-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
skipping to change at page 64, line 34 skipping to change at page 65, line 29
| +--rw client-identity | +--rw client-identity
| | +--rw (auth-type)? | | +--rw (auth-type)?
| | +--:(certificate) | | +--:(certificate)
| | | {x509-certificate-auth}? | | | {x509-certificate-auth}?
| | | +--rw certificate | | | +--rw certificate
| | | +--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
| | | | | iasa:asymmetric-\
\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
skipping to change at page 65, line 33 skipping to change at page 66, line 26
| | | | +--rw cert? | | | | +--rw cert?
| | | | | end-entity-cert-\ | | | | | end-entity-cert-\
\cms \cms
| | | | +---n certificate-expira\ | | | | +---n certificate-expira\
\tion \tion
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and\ | | | | | yang:date-and\
\-time \-time
| | | | +---x generate-certifica\ | | | | +---x generate-certifica\
\te-signing-request \te-signing-request
| | | | {certificate-sig\
\ning-request-generation}?
| | | | +---w input | | | | +---w input
| | | | | +---w subject | | | | | +---w subject
| | | | | | binary | | | | | | binary
| | | | | +---w attributes? | | | | | +---w attributes?
| | | | | binary | | | | | binary
| | | | +--ro output | | | | +--ro output
| | | | +--ro certificate-\ | | | | +--ro certificate-\
\signing-request \signing-request
| | | | binary | | | | ct:csr
| | | +--:(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)
| | | {raw-public-key-auth}? | | | {raw-public-key-auth}?
| | | +--rw raw-private-key | | | +--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
| | | | | iasa:asymmetric-\
\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
skipping to change at page 67, line 11 skipping to change at page 67, line 50
| | | +--rw keystore-reference? | | | +--rw keystore-reference?
| | | ks:asymmetric-key-r\ | | | ks:asymmetric-key-r\
\ef \ef
| | +--:(psk) {psk-auth}? | | +--:(psk) {psk-auth}?
| | +--rw psk | | +--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
| | | | isa:symmetric-al\
\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)
skipping to change at page 68, line 13 skipping to change at page 68, line 49
| | | +--:(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,certi\
\certificates}? \ficates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificate-bag-ref | | | ts:certificate-bag-ref
| | +--rw server-certs! | | +--rw ee-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,certi\
\certificates}? \ficates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificate-bag-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 public-key* [name] | | | | +--rw public-key* [name]
| | | | +--rw name | | | | +--rw name
| | | | | string | | | | | string
| | | | +--rw algorithm
| | | | | iasa:asymmetric-alg\
\orithm-type
| | | | +--rw public-key-format | | | | +--rw public-key-format
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | binary | | | | binary
| | | +--:(truststore) | | | +--:(truststore)
| | | {truststore-supported,publi\ | | | {truststore-supported,publi\
\c-keys}? \c-keys}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:public-key-bag-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 peer-allowed-to-send? empty
| +--rw max-attempts? uint8 | +--rw test-peer-aliveness!
| +--rw max-wait? uint16
| +--rw max-attempts? uint8
+--rw netconf-client-parameters +--rw netconf-client-parameters
A.2. Expanded Tree Diagram for 'ietf-netconf-server' A.2. Expanded Tree Diagram for 'ietf-netconf-server'
The following tree diagram [RFC8340] provides an overview of the data The following tree diagram [RFC8340] provides an overview of the data
model for the "ietf-netconf-server" module. model for the "ietf-netconf-server" module.
This tree diagram shows all the nodes defined in this module, This tree diagram shows all the nodes defined in this module,
including those defined by "grouping" statements used by this module. including those defined by "grouping" statements used by this module.
skipping to change at page 70, line 13 skipping to change at page 70, line 47
| | | | +--rw host-key* [name] | | | | +--rw host-key* [name]
| | | | +--rw name string | | | | +--rw name string
| | | | +--rw (host-key-type) | | | | +--rw (host-key-type)
| | | | +--:(public-key) | | | | +--:(public-key)
| | | | | +--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
| | | | | | | iasa:asymmetr\
\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)
skipping to change at page 71, line 23 skipping to change at page 72, line 5
| | | | | ks:asymmetric-ke\ | | | | | ks:asymmetric-ke\
\y-ref \y-ref
| | | | +--:(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\ | | | | | {local-definitions\
\-supported}? \-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm
| | | | | | iasa:asymmetr\
\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)
skipping to change at page 72, line 24 skipping to change at page 73, line 4
| | | | | | +--rw value? | | | | | | +--rw value?
| | | | | | bina\ | | | | | | bina\
\ry \ry
| | | | | +--rw cert? | | | | | +--rw cert?
| | | | | | end-entity-ce\ | | | | | | end-entity-ce\
\rt-cms \rt-cms
| | | | | +---n certificate-exp\ | | | | | +---n certificate-exp\
\iration \iration
| | | | | | +-- expiration-date | | | | | | +-- expiration-date
| | | | | | yang:date-\ | | | | | | yang:date-\
\and-time \and-time
| | | | | +---x generate-certif\ | | | | | +---x generate-certif\
\icate-signing-request \icate-signing-request
| | | | | {certificate-\
\signing-request-generation}?
| | | | | +---w input | | | | | +---w input
| | | | | | +---w subject | | | | | | +---w subject
| | | | | | | binary | | | | | | | binary
| | | | | | +---w attribute\ | | | | | | +---w attribute\
\s? \s?
| | | | | | binary | | | | | | binary
| | | | | +--ro output | | | | | +--ro output
| | | | | +--ro certifica\ | | | | | +--ro certifica\
\te-signing-request \te-signing-request
| | | | | binary | | | | | ct:csr
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-supporte\ | | | | {keystore-supporte\
\d}? \d}?
| | | | +--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 password? empty
| | | | | | {client-auth-password}? | | | | | | {client-auth-password}?
| | | | | +--rw hostbased? empty | | | | | +--rw hostbased? empty
| | | | | | {client-auth-hostbased}? | | | | | | {client-auth-hostbased}?
| | | | | +--rw none? empty | | | | | +--rw none? empty
| | | | | {client-auth-none}? | | | | | {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 public-keys! | | | | | +--rw public-keys!
| | | | | | {client-auth-publickey}?
| | | | | | +--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 public-key* [name] | | | | | | | +--rw public-key* [name]
| | | | | | | +--rw name | | | | | | | +--rw name
| | | | | | | | string | | | | | | | | string
| | | | | | | +--rw algorithm
| | | | | | | | iasa:asymmetr\
\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\
\,public-keys}? \,public-keys}?
| | | | | | +--rw truststore-reference? | | | | | | +--rw truststore-reference?
| | | | | | ts:public-key-bag-r\ | | | | | | ts:public-key-bag-r\
skipping to change at page 73, line 46 skipping to change at page 74, line 26
| | | | | +--rw hostbased! | | | | | +--rw hostbased!
| | | | | | {client-auth-hostbased}? | | | | | | {client-auth-hostbased}?
| | | | | | +--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 public-key* [name] | | | | | | | +--rw public-key* [name]
| | | | | | | +--rw name | | | | | | | +--rw name
| | | | | | | | string | | | | | | | | string
| | | | | | | +--rw algorithm
| | | | | | | | iasa:asymmetr\
\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\
\,public-keys}? \,public-keys}?
| | | | | | +--rw truststore-reference? | | | | | | +--rw truststore-reference?
| | | | | | ts:public-key-bag-r\ | | | | | | ts:public-key-bag-r\
skipping to change at page 74, line 28 skipping to change at page 75, line 5
| | | | | +--:(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,certi\
\certificates}? \ficates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificate-bag-ref | | | | | ts:certificate-bag-ref
| | | | +--rw client-certs! | | | | +--rw ee-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,certi\
\certificates}? \ficates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-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
skipping to change at page 75, line 45 skipping to change at page 76, line 22
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (auth-type) | | | +--rw (auth-type)
| | | +--:(certificate) | | | +--:(certificate)
| | | | {x509-certificate-auth}? | | | | {x509-certificate-auth}?
| | | | +--rw certificate | | | | +--rw certificate
| | | | +--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
| | | | | | iasa:asymmetric-\
\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
skipping to change at page 76, line 44 skipping to change at page 77, line 18
| | | | | +--rw cert? | | | | | +--rw cert?
| | | | | | end-entity-cert-\ | | | | | | end-entity-cert-\
\cms \cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
| | | | | | +-- expiration-date | | | | | | +-- expiration-date
| | | | | | yang:date-and\ | | | | | | yang:date-and\
\-time \-time
| | | | | +---x generate-certifica\ | | | | | +---x generate-certifica\
\te-signing-request \te-signing-request
| | | | | {certificate-sig\
\ning-request-generation}?
| | | | | +---w input | | | | | +---w input
| | | | | | +---w subject | | | | | | +---w subject
| | | | | | | binary | | | | | | | binary
| | | | | | +---w attributes? | | | | | | +---w attributes?
| | | | | | binary | | | | | | binary
| | | | | +--ro output | | | | | +--ro output
| | | | | +--ro certificate-\ | | | | | +--ro certificate-\
\signing-request \signing-request
| | | | | binary | | | | | ct:csr
| | | | +--:(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}? | | | | {raw-public-key-auth}?
| | | | +--rw raw-private-key | | | | +--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
| | | | | | iasa:asymmetric-\
\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
skipping to change at page 78, line 22 skipping to change at page 78, line 43
| | | | +--rw keystore-reference? | | | | +--rw keystore-reference?
| | | | ks:asymmetric-key-r\ | | | | ks:asymmetric-key-r\
\ef \ef
| | | +--:(psk) {psk-auth}? | | | +--:(psk) {psk-auth}?
| | | +--rw psk | | | +--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
| | | | | isa:symmetric-al\
\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)
skipping to change at page 79, line 25 skipping to change at page 79, line 43
| | | | +--:(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,certi\
\certificates}? \ficates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-ref | | | | ts:certificate-bag-ref
| | | +--rw client-certs! | | | +--rw ee-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,certi\
\certificates}? \ficates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-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 public-key* [name] | | | | | +--rw public-key* [name]
| | | | | +--rw name | | | | | +--rw name
| | | | | | string | | | | | | string
| | | | | +--rw algorithm
| | | | | | iasa:asymmetric-alg\
\orithm-type
| | | | | +--rw public-key-format | | | | | +--rw public-key-format
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported,publi\ | | | | {truststore-supported,publi\
\c-keys}? \c-keys}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:public-key-bag-ref | | | | ts:public-key-bag-ref
| | | +--rw psks! {psk-auth}? | | | +--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 peer-allowed-to-send? empty
| | +--rw max-attempts? uint8 | | +--rw test-peer-aliveness!
| | +--rw max-wait? uint16
| | +--rw max-attempts? uint8
| +--rw netconf-server-parameters | +--rw netconf-server-parameters
| +--rw client-identity-mappings | +--rw client-identity-mappings
| {tls-listen or tls-call-home or sshcm\ | {tls-listen or tls-call-home or sshcm\
\n:ssh-x509-certs}? \n:ssh-x509-certs}?
| +--rw cert-to-name* [id] | +--rw cert-to-name* [id]
| +--rw id uint32 | +--rw id uint32
| +--rw fingerprint? | +--rw fingerprint?
| | x509c2n:tls-fingerprint | | x509c2n:tls-fingerprint
| +--rw map-type identityref | +--rw map-type identityref
| +--rw name string | +--rw name string
skipping to change at page 81, line 26 skipping to change at page 81, line 42
| | | | +--rw name string | | | | +--rw name string
| | | | +--rw (host-key-type) | | | | +--rw (host-key-type)
| | | | +--:(public-key) | | | | +--:(public-key)
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | +--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
| | | | | | | iasa:as\
\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
skipping to change at page 82, line 45 skipping to change at page 83, line 9
| | | | +--:(certificate) | | | | +--:(certificate)
| | | | +--rw certificate | | | | +--rw certificate
| | | | {sshcmn:ssh-x509-ce\ | | | | {sshcmn:ssh-x509-ce\
\rts}? \rts}?
| | | | +--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
| | | | | | iasa:as\
\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
skipping to change at page 84, line 8 skipping to change at page 84, line 19
| | | | | | end-ent\ | | | | | | end-ent\
\ity-cert-cms \ity-cert-cms
| | | | | +---n certifica\ | | | | | +---n certifica\
\te-expiration \te-expiration
| | | | | | +-- expirati\ | | | | | | +-- expirati\
\on-date \on-date
| | | | | | yang\ | | | | | | yang\
\:date-and-time \:date-and-time
| | | | | +---x generate-\ | | | | | +---x generate-\
\certificate-signing-request \certificate-signing-request
| | | | | {certif\
\icate-signing-request-generation}?
| | | | | +---w input | | | | | +---w input
| | | | | | +---w sub\ | | | | | | +---w sub\
\ject \ject
| | | | | | | b\ | | | | | | | b\
\inary \inary
| | | | | | +---w att\ | | | | | | +---w att\
\ributes? \ributes?
| | | | | | b\ | | | | | | b\
\inary \inary
| | | | | +--ro output | | | | | +--ro output
| | | | | +--ro cer\ | | | | | +--ro cer\
\tificate-signing-request \tificate-signing-request
| | | | | b\ | | | | | c\
\inary \t:csr
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-su\ | | | | {keystore-su\
\pported}? \pported}?
| | | | +--rw keystore-ref\ | | | | +--rw keystore-ref\
\erence \erence
| | | | +--rw asymmetri\ | | | | +--rw asymmetri\
\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 password? empty
| | | | | | {client-auth-password}? | | | | | | {client-auth-password}?
| | | | | +--rw hostbased? empty | | | | | +--rw hostbased? empty
| | | | | | {client-auth-hostbased}? | | | | | | {client-auth-hostbased}?
| | | | | +--rw none? empty | | | | | +--rw none? empty
| | | | | {client-auth-none}? | | | | | {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 public-keys!
| | | | | | {client-auth-publickey\
\}?
| | | | | | +--rw (local-or-truststore) | | | | | | +--rw (local-or-truststore)
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-definiti\ | | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | | +--rw local-definition | | | | | | | +--rw local-definition
| | | | | | | +--rw public-key* | | | | | | | +--rw public-key*
| | | | | | | [name] | | | | | | | [name]
| | | | | | | +--rw name | | | | | | | +--rw name
| | | | | | | | string | | | | | | | | string
| | | | | | | +--rw algorithm
| | | | | | | | iasa:as\
\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
| | | | | | +--:(truststore) | | | | | | +--:(truststore)
| | | | | | {truststore-sup\ | | | | | | {truststore-sup\
\ported,public-keys}? \ported,public-keys}?
| | | | | | +--rw truststore-refe\ | | | | | | +--rw truststore-refe\
skipping to change at page 85, line 42 skipping to change at page 86, line 4
\}? \}?
| | | | | | +--rw (local-or-truststore) | | | | | | +--rw (local-or-truststore)
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-definiti\ | | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | | +--rw local-definition | | | | | | | +--rw local-definition
| | | | | | | +--rw public-key* | | | | | | | +--rw public-key*
| | | | | | | [name] | | | | | | | [name]
| | | | | | | +--rw name | | | | | | | +--rw name
| | | | | | | | string | | | | | | | | string
| | | | | | | +--rw algorithm
| | | | | | | | iasa:as\
\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
| | | | | | +--:(truststore) | | | | | | +--:(truststore)
| | | | | | {truststore-sup\ | | | | | | {truststore-sup\
\ported,public-keys}? \ported,public-keys}?
| | | | | | +--rw truststore-refe\ | | | | | | +--rw truststore-refe\
\rence? \rence?
| | | | | | ts:public-key\ | | | | | | ts:public-key\
\-bag-ref \-bag-ref
| | | | | +--rw none? empty | | | | | +--rw none? empty
| | | | | {client-auth-none}? | | | | | {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}?
skipping to change at page 86, line 30 skipping to change at page 86, line 37
| | | | | | +--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}? \,certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificate-bag-\ | | | | | ts:certificate-bag-\
\ref \ref
| | | | +--rw client-certs! | | | | +--rw ee-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}? \,certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-\ | | | | ts:certificate-bag-\
\ref \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*
skipping to change at page 88, line 11 skipping to change at page 88, line 19
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (auth-type) | | | +--rw (auth-type)
| | | +--:(certificate) | | | +--:(certificate)
| | | | {x509-certificate-auth}? | | | | {x509-certificate-auth}?
| | | | +--rw certificate | | | | +--rw certificate
| | | | +--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
| | | | | | iasa:asymm\
\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)
skipping to change at page 89, line 21 skipping to change at page 89, line 25
| | | | | | end-entity\ | | | | | | end-entity\
\-cert-cms \-cert-cms
| | | | | +---n certificate-\ | | | | | +---n certificate-\
\expiration \expiration
| | | | | | +-- expiration-\ | | | | | | +-- expiration-\
\date \date
| | | | | | yang:da\ | | | | | | yang:da\
\te-and-time \te-and-time
| | | | | +---x generate-cer\ | | | | | +---x generate-cer\
\tificate-signing-request \tificate-signing-request
| | | | | {certifica\
\te-signing-request-generation}?
| | | | | +---w input | | | | | +---w input
| | | | | | +---w subject | | | | | | +---w subject
| | | | | | | bina\ | | | | | | | bina\
\ry \ry
| | | | | | +---w attrib\ | | | | | | +---w attrib\
\utes? \utes?
| | | | | | bina\ | | | | | | bina\
\ry \ry
| | | | | +--ro output | | | | | +--ro output
| | | | | +--ro certif\ | | | | | +--ro certif\
\icate-signing-request \icate-signing-request
| | | | | bina\ | | | | | ct:c\
\ry \sr
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-suppo\ | | | | {keystore-suppo\
\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}? | | | | {raw-public-key-auth}?
| | | | +--rw raw-private-key | | | | +--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
| | | | | | iasa:asymm\
\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)
skipping to change at page 91, line 17 skipping to change at page 91, line 20
\nce? \nce?
| | | | ks:asymmetric\ | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | +--:(psk) {psk-auth}? | | | +--:(psk) {psk-auth}?
| | | +--rw psk | | | +--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
| | | | | isa:symmet\
\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?
skipping to change at page 92, line 34 skipping to change at page 92, line 36
| | | | | +--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}? \,certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-\ | | | | ts:certificate-bag-\
\ref \ref
| | | +--rw client-certs! | | | +--rw ee-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\
skipping to change at page 93, line 4 skipping to change at page 93, line 5
| | | | | {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}? \,certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificate-bag-\ | | | | ts:certificate-bag-\
\ref \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 public-key* [name] | | | | | +--rw public-key* [name]
| | | | | +--rw name | | | | | +--rw name
| | | | | | string | | | | | | string
| | | | | +--rw algorithm
| | | | | | iasa:asymmetr\
\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\
\,public-keys}? \,public-keys}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:public-key-bag-r\ | | | | ts:public-key-bag-r\
\ef \ef
| | | +--rw psks! {psk-auth}? | | | +--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 peer-allowed-to-send? empty
| | +--rw max-attempts? uint8 | | +--rw test-peer-aliveness!
| | +--rw max-wait? uint16
| | +--rw max-attempts? uint8
| +--rw netconf-server-parameters | +--rw netconf-server-parameters
| +--rw client-identity-mappings | +--rw client-identity-mappings
| {tls-listen or tls-call-home or\ | {tls-listen or tls-call-home or\
\ sshcmn:ssh-x509-certs}? \ sshcmn:ssh-x509-certs}?
| +--rw cert-to-name* [id] | +--rw cert-to-name* [id]
| +--rw id uint32 | +--rw id uint32
| +--rw fingerprint? | +--rw fingerprint?
| | x509c2n:tls-fingerprint | | x509c2n:tls-fingerprint
| +--rw map-type identityref | +--rw map-type identityref
| +--rw name string | +--rw name string
skipping to change at page 97, line 47 skipping to change at page 97, line 47
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 B.18. 17 to 18
o Updated examples to reflect new "bag" addition to truststore. o Updated examples to reflect new "bag" addition to truststore.
B.19. 18 to 19
o Updated examples to remove the 'algorithm' nodes.
o Updated examples to reflect the new TLS keepalives structure.
o Added keepalives to the tcp-client-parameters section in the
netconf-server SSH-based call-home example.
o Added a TLS-based call-home example to the netconf-client example.
o Added a "Note to Reviewers" note to first page.
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, Ladislav Lhotka, Alan Luchuk, 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
Kent Watsen Kent Watsen
Watsen Networks Watsen Networks
EMail: kent+ietf@watsen.net EMail: kent+ietf@watsen.net
 End of changes. 180 change blocks. 
677 lines changed or deleted 671 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/