draft-ietf-netconf-restconf-client-server-17.txt   draft-ietf-netconf-restconf-client-server-18.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Watsen Networks Internet-Draft Watsen Networks
Intended status: Standards Track November 20, 2019 Intended status: Standards Track March 8, 2020
Expires: May 23, 2020 Expires: September 9, 2020
RESTCONF Client and Server Models RESTCONF Client and Server Models
draft-ietf-netconf-restconf-client-server-17 draft-ietf-netconf-restconf-client-server-18
Abstract Abstract
This document defines two YANG modules, one module to configure a This document defines two YANG modules, one module to configure a
RESTCONF client and the other module to configure a RESTCONF server. RESTCONF client and the other module to configure a RESTCONF server.
Both modules support the TLS transport protocol with both standard Both modules support the TLS transport protocol with both standard
RESTCONF and RESTCONF Call Home connections. RESTCONF and RESTCONF Call Home connections.
Editorial Note (To be removed by RFC Editor) Editorial Note (To be removed by RFC Editor)
skipping to change at page 2, line 11 skipping to change at page 2, line 11
o "BBBB" --> the assigned RFC value for I-D.ietf-netconf-tls-client- o "BBBB" --> the assigned RFC value for I-D.ietf-netconf-tls-client-
server server
o "CCCC" --> the assigned RFC value for I-D.ietf-netconf-http- o "CCCC" --> the assigned RFC value for I-D.ietf-netconf-http-
client-server client-server
Artwork in this document contains placeholder values for the date of Artwork in this document contains placeholder values for the date of
publication of this draft. Please apply the following replacement: publication of this draft. Please apply the following replacement:
o "2019-11-20" --> the publication date of this draft o "2020-03-08" --> the publication date of this draft
The following Appendix section is to be removed prior to publication: The following Appendix section is to be removed prior to publication:
o Appendix B. Change Log o Appendix B. Change Log
Status of This Memo Status of This Memo
This Internet-Draft is submitted in full conformance with the This Internet-Draft is submitted in full conformance with the
provisions of BCP 78 and BCP 79. provisions of BCP 78 and BCP 79.
Internet-Drafts are working documents of the Internet Engineering Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF). Note that other groups may also distribute Task Force (IETF). Note that other groups may also distribute
working documents as Internet-Drafts. The list of current Internet- working documents as Internet-Drafts. The list of current Internet-
Drafts is at https://datatracker.ietf.org/drafts/current/. Drafts is at https://datatracker.ietf.org/drafts/current/.
Internet-Drafts are draft documents valid for a maximum of six months Internet-Drafts are draft documents valid for a maximum of six months
and may be updated, replaced, or obsoleted by other documents at any and may be updated, replaced, or obsoleted by other documents at any
time. It is inappropriate to use Internet-Drafts as reference time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress." material or to cite them other than as "work in progress."
This Internet-Draft will expire on May 23, 2020. This Internet-Draft will expire on September 9, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2019 IETF Trust and the persons identified as the Copyright (c) 2020 IETF Trust and the persons identified as the
document authors. All rights reserved. document authors. All rights reserved.
This document is subject to BCP 78 and the IETF Trust's Legal This document is subject to BCP 78 and the IETF Trust's Legal
Provisions Relating to IETF Documents Provisions Relating to IETF Documents
(https://trustee.ietf.org/license-info) in effect on the date of (https://trustee.ietf.org/license-info) in effect on the date of
publication of this document. Please review these documents publication of this document. Please review these documents
carefully, as they describe your rights and restrictions with respect carefully, as they describe your rights and restrictions with respect
to this document. Code Components extracted from this document must to this document. Code Components extracted from this document must
include Simplified BSD License text as described in Section 4.e of include Simplified BSD License text as described in Section 4.e of
the Trust Legal Provisions and are provided without warranty as the Trust Legal Provisions and are provided without warranty as
described in the Simplified BSD License. described in the Simplified BSD License.
Table of Contents Table of Contents
1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 3 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 4
1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 4 1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 4
2. The RESTCONF Client Model . . . . . . . . . . . . . . . . . . 4 2. The RESTCONF Client Model . . . . . . . . . . . . . . . . . . 4
2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4
2.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 5 2.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 6
2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9 2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9
3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 19 3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 19
3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 19 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 19
3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 21 3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 21
3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 25 3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 25
4. Security Considerations . . . . . . . . . . . . . . . . . . . 37 4. Security Considerations . . . . . . . . . . . . . . . . . . . 37
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 38 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 38
5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 38 5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 38
5.2. The YANG Module Names Registry . . . . . . . . . . . . . 38 5.2. The YANG Module Names Registry . . . . . . . . . . . . . 38
6. References . . . . . . . . . . . . . . . . . . . . . . . . . 39 6. References . . . . . . . . . . . . . . . . . . . . . . . . . 39
6.1. Normative References . . . . . . . . . . . . . . . . . . 39 6.1. Normative References . . . . . . . . . . . . . . . . . . 39
6.2. Informative References . . . . . . . . . . . . . . . . . 40 6.2. Informative References . . . . . . . . . . . . . . . . . 40
Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 41 Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 41
A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 41 A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 41
A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 66 A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 67
Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 80 Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 81
B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 80 B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 81
B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 80 B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 81
B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 80 B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 81
B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 81 B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 81
B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 81 B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 82
B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 81 B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 82
B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 81 B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 82
B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 82 B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 82
B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 82 B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 82
B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 82 B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 83
B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 82 B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 83
B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 82 B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 83
B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 83 B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 83
B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 83 B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 84
B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 83 B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 84
B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 84 B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 84
B.17. 16 to 17 . . . . . . . . . . . . . . . . . . . . . . . . 84 B.17. 16 to 17 . . . . . . . . . . . . . . . . . . . . . . . . 84
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 84 B.18. 17 to 18 . . . . . . . . . . . . . . . . . . . . . . . . 85
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 84 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 85
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 85
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 RESTCONF client and the other module to configure a configure a RESTCONF client and the other module to configure a
RESTCONF server [RFC8040]. Both modules support the TLS [RFC8446] RESTCONF server [RFC8040]. Both modules support the TLS [RFC8446]
transport protocol with both standard RESTCONF and RESTCONF Call Home transport protocol with both standard RESTCONF and RESTCONF Call Home
connections [RFC8071]. connections [RFC8071].
1.1. Terminology 1.1. Terminology
skipping to change at page 6, line 44 skipping to change at page 7, line 4
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</p\ <private-key-format>ct:rsa-private-key-format</p\
rivate-key-format> rivate-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</certificate> </certificate>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs> <ca-certs>
<truststore-reference>explicitly-trusted-server-ca\ <truststore-reference>trusted-server-ca-certs</tru\
-certs</truststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<server-certs> <server-certs>
<truststore-reference>explicitly-trusted-server-ce\ <truststore-reference>trusted-server-ee-certs</tru\
rts</truststore-reference> ststore-reference>
</server-certs> </server-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <max-wait>30</max-wait>
<max-attempts>3</max-attempts> <max-attempts>3</max-attempts>
</keepalives> </keepalives>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<client-identity> <client-identity>
<basic> <basic>
skipping to change at page 7, line 43 skipping to change at page 8, line 4
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<public-key-format>ct:subject-public-key-info-fo\ <public-key-format>ct:subject-public-key-info-fo\
rmat</public-key-format> rmat</public-key-format>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</p\ <private-key-format>ct:rsa-private-key-format</p\
rivate-key-format> rivate-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</certificate> </certificate>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs> <ca-certs>
<truststore-reference>explicitly-trusted-server-ca\ <truststore-reference>trusted-server-ca-certs</tru\
-certs</truststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<server-certs> <server-certs>
<truststore-reference>explicitly-trusted-server-ce\ <truststore-reference>trusted-server-ee-certs</tru\
rts</truststore-reference> ststore-reference>
</server-certs> </server-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <max-wait>30</max-wait>
<max-attempts>3</max-attempts> <max-attempts>3</max-attempts>
</keepalives> </keepalives>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<client-identity> <client-identity>
<basic> <basic>
skipping to change at page 9, line 5 skipping to change at page 9, line 14
<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>
</client-identity> </client-identity>
<server-authentication> <server-authentication>
<ca-certs> <ca-certs>
<truststore-reference>explicitly-trusted-server-ca-cer\ <truststore-reference>trusted-server-ca-certs</trustst\
ts</truststore-reference> ore-reference>
</ca-certs> </ca-certs>
<server-certs> <server-certs>
<truststore-reference>explicitly-trusted-server-certs<\ <truststore-reference>trusted-server-ee-certs</trustst\
/truststore-reference> ore-reference>
</server-certs> </server-certs>
</server-authentication> </server-authentication>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<client-identity> <client-identity>
<basic> <basic>
<user-id>bob</user-id> <user-id>bob</user-id>
<password>secret</password> <password>secret</password>
</basic> </basic>
</client-identity> </client-identity>
skipping to change at page 9, line 34 skipping to change at page 9, line 43
</listen> </listen>
</restconf-client> </restconf-client>
2.3. YANG Module 2.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC8040], This YANG module has normative references to [RFC6991], [RFC8040],
and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
<CODE BEGINS> file "ietf-restconf-client@2019-11-20.yang" <CODE BEGINS> file "ietf-restconf-client@2020-03-08.yang"
module ietf-restconf-client { module ietf-restconf-client {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-client"; namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-client";
prefix rcc; prefix rcc;
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 11, line 8 skipping to change at page 11, line 18
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices. itself for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-11-20 { revision 2020-03-08 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: RESTCONF Client and Server Models"; "RFC XXXX: RESTCONF Client and Server Models";
} }
// Features // Features
feature https-initiate { feature https-initiate {
description description
skipping to change at page 22, line 4 skipping to change at page 22, line 13
<local-definition> <local-definition>
<algorithm>rsa2048</algorithm> <algorithm>rsa2048</algorithm>
<public-key-format>ct:subject-public-key-info-format\ <public-key-format>ct:subject-public-key-info-format\
</public-key-format> </public-key-format>
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</priva\ <private-key-format>ct:rsa-private-key-format</priva\
te-key-format> te-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</certificate> </certificate>
</server-identity> </server-identity>
<client-authentication> <client-authentication>
<ca-certs> <ca-certs>
<truststore-reference>explicitly-trusted-client-ca-cer\ <truststore-reference>trusted-client-ca-certs</trustst\
ts</truststore-reference> ore-reference>
</ca-certs> </ca-certs>
<client-certs> <client-certs>
<truststore-reference>explicitly-trusted-client-certs<\ <truststore-reference>trusted-client-ee-certs</trustst\
/truststore-reference> ore-reference>
</client-certs> </client-certs>
</client-authentication> </client-authentication>
</tls-server-parameters> </tls-server-parameters>
<http-server-parameters> <http-server-parameters>
<server-name>foo.example.com</server-name> <server-name>foo.example.com</server-name>
<protocol-versions> <protocol-versions>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
skipping to change at page 23, line 23 skipping to change at page 23, line 31
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</p\ <private-key-format>ct:rsa-private-key-format</p\
rivate-key-format> rivate-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</certificate> </certificate>
</server-identity> </server-identity>
<client-authentication> <client-authentication>
<ca-certs> <ca-certs>
<truststore-reference>explicitly-trusted-client-ca\ <truststore-reference>trusted-client-ca-certs</tru\
-certs</truststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<client-certs> <client-certs>
<truststore-reference>explicitly-trusted-client-ce\ <truststore-reference>trusted-client-ee-certs</tru\
rts</truststore-reference> ststore-reference>
</client-certs> </client-certs>
</client-authentication> </client-authentication>
</tls-server-parameters> </tls-server-parameters>
<http-server-parameters> <http-server-parameters>
<server-name>foo.example.com</server-name> <server-name>foo.example.com</server-name>
<protocol-versions> <protocol-versions>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
skipping to change at page 24, line 30 skipping to change at page 24, line 38
<public-key>base64encodedvalue==</public-key> <public-key>base64encodedvalue==</public-key>
<private-key-format>ct:rsa-private-key-format</p\ <private-key-format>ct:rsa-private-key-format</p\
rivate-key-format> rivate-key-format>
<private-key>base64encodedvalue==</private-key> <private-key>base64encodedvalue==</private-key>
<cert>base64encodedvalue==</cert> <cert>base64encodedvalue==</cert>
</local-definition> </local-definition>
</certificate> </certificate>
</server-identity> </server-identity>
<client-authentication> <client-authentication>
<ca-certs> <ca-certs>
<truststore-reference>explicitly-trusted-client-ca\ <truststore-reference>trusted-client-ca-certs</tru\
-certs</truststore-reference> ststore-reference>
</ca-certs> </ca-certs>
<client-certs> <client-certs>
<truststore-reference>explicitly-trusted-client-ce\ <truststore-reference>trusted-client-ee-certs</tru\
rts</truststore-reference> ststore-reference>
</client-certs> </client-certs>
</client-authentication> </client-authentication>
</tls-server-parameters> </tls-server-parameters>
<http-server-parameters> <http-server-parameters>
<server-name>foo.example.com</server-name> <server-name>foo.example.com</server-name>
<protocol-versions> <protocol-versions>
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-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>
<id>2</id> <id>2</id>
<map-type>x509c2n:san-any</map-type> <map-type>x509c2n:san-any</map-type>
</cert-to-name> </cert-to-name>
</client-identity-mappings> </client-identity-mappings>
</restconf-server-parameters> </restconf-server-parameters>
</https> </https>
</endpoint> </endpoint>
</endpoints> </endpoints>
skipping to change at page 25, line 36 skipping to change at page 25, line 45
</call-home> </call-home>
</restconf-server> </restconf-server>
3.3. YANG Module 3.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC7407], This YANG module has normative references to [RFC6991], [RFC7407],
[RFC8040], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], [RFC8040], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
<CODE BEGINS> file "ietf-restconf-server@2019-11-20.yang" <CODE BEGINS> file "ietf-restconf-server@2020-03-08.yang"
module ietf-restconf-server { module ietf-restconf-server {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-server"; namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-server";
prefix rcs; prefix rcs;
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 27, line 24 skipping to change at page 27, line 33
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices. itself for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-11-20 { revision 2020-03-08 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: RESTCONF Client and Server Models"; "RFC XXXX: RESTCONF Client and Server Models";
} }
// Features // Features
feature http-listen { feature http-listen {
description description
skipping to change at page 31, line 4 skipping to change at page 31, line 14
"A wrapper around the TCP server parameters "A wrapper around the TCP server parameters
to avoid name collisions."; to avoid name collisions.";
uses tcps:tcp-server-grouping { uses tcps:tcp-server-grouping {
refine "local-port" { refine "local-port" {
default "443"; default "443";
description description
"The RESTCONF server will listen on the IANA- "The RESTCONF server will listen on the IANA-
assigned well-known port value for 'https' assigned well-known port value for 'https'
(443) if no value is specified."; (443) if no value is specified.";
} }
} }
} }
container tls-server-parameters { container tls-server-parameters {
description description
"A wrapper around the TLS server parameters "A wrapper around the TLS server parameters
to avoid name collisions."; to 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" {
must 'ca-certs or client-certs';
description
"NETCONF/TLS servers MUST validate client
certificates.";
}*/
} }
container http-server-parameters { container http-server-parameters {
description description
"A wrapper around the HTTP server parameters "A wrapper around the HTTP server parameters
to avoid name collisions."; to avoid name collisions.";
uses https:http-server-grouping; uses https:http-server-grouping;
} }
container restconf-server-parameters { container restconf-server-parameters {
description description
"A wrapper around the RESTCONF server parameters "A wrapper around the RESTCONF server parameters
skipping to change at page 39, line 21 skipping to change at page 39, line 21
namespace: urn:ietf:params:xml:ns:yang:ietf-restconf-server namespace: urn:ietf:params:xml:ns:yang:ietf-restconf-server
prefix: ncs prefix: ncs
reference: RFC XXXX reference: RFC XXXX
6. References 6. References
6.1. Normative References 6.1. Normative References
[I-D.ietf-netconf-keystore] [I-D.ietf-netconf-keystore]
Watsen, K., "A YANG Data Model for a Keystore", draft- Watsen, K., "A YANG Data Model for a Keystore", draft-
ietf-netconf-keystore-14 (work in progress), November ietf-netconf-keystore-15 (work in progress), November
2019. 2019.
[I-D.ietf-netconf-tls-client-server] [I-D.ietf-netconf-tls-client-server]
Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS
Clients and TLS Servers", draft-ietf-netconf-tls-client- Clients and TLS Servers", draft-ietf-netconf-tls-client-
server-16 (work in progress), November 2019. server-17 (work in progress), November 2019.
[I-D.kwatsen-netconf-http-client-server] [I-D.kwatsen-netconf-http-client-server]
Watsen, K., "YANG Groupings for HTTP Clients and HTTP Watsen, K., "YANG Groupings for HTTP Clients and HTTP
Servers", draft-kwatsen-netconf-http-client-server-05 Servers", draft-kwatsen-netconf-http-client-server-05
(work in progress), November 2019. (work in progress), November 2019.
[I-D.kwatsen-netconf-tcp-client-server] [I-D.kwatsen-netconf-tcp-client-server]
Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients
and TCP Servers", draft-kwatsen-netconf-tcp-client- and TCP Servers", draft-kwatsen-netconf-tcp-client-
server-02 (work in progress), April 2019. server-02 (work in progress), April 2019.
skipping to change at page 40, line 28 skipping to change at page 40, line 28
RFC 8071, DOI 10.17487/RFC8071, February 2017, RFC 8071, DOI 10.17487/RFC8071, February 2017,
<https://www.rfc-editor.org/info/rfc8071>. <https://www.rfc-editor.org/info/rfc8071>.
[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>.
6.2. Informative References 6.2. Informative References
[I-D.ietf-netconf-trust-anchors] [I-D.ietf-netconf-trust-anchors]
Watsen, K. and H. Birkholz, "A YANG Data Model for a Watsen, K., "A YANG Data Model for a Truststore", draft-
Truststore", draft-ietf-netconf-trust-anchors-07 (work in ietf-netconf-trust-anchors-08 (work in progress), November
progress), November 2019. 2019.
[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688, [RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
DOI 10.17487/RFC3688, January 2004, DOI 10.17487/RFC3688, January 2004,
<https://www.rfc-editor.org/info/rfc3688>. <https://www.rfc-editor.org/info/rfc3688>.
[RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed., [RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
and A. Bierman, Ed., "Network Configuration Protocol and A. Bierman, Ed., "Network Configuration Protocol
(NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011, (NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
<https://www.rfc-editor.org/info/rfc6241>. <https://www.rfc-editor.org/info/rfc6241>.
skipping to change at page 41, line 45 skipping to change at page 41, 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 tls-client-parameters | | +--rw tls-client-parameters
| | | +--rw client-identity | | | +--rw client-identity
| | | | +--rw (auth-type) | | | | +--rw (auth-type)?
| | | | +--:(certificate) | | | | +--:(certificate)
| | | | | {x509-certificate-auth}?
| | | | | +--rw certificate | | | | | +--rw certificate
| | | | | {x509-certificate-auth\
\}?
| | | | | +--rw (local-or-keystore) | | | | | +--rw (local-or-keystore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definiti\ | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw algorithm | | | | | | +--rw algorithm
| | | | | | | iasa:asymm\ | | | | | | | iasa:asymm\
\etric-algorithm-type \etric-algorithm-type
| | | | | | +--rw public-key-f\ | | | | | | +--rw public-key-f\
\ormat? \ormat
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw public-key | | | | | | +--rw public-key
| | | | | | | binary | | | | | | | binary
| | | | | | +--rw private-key-\ | | | | | | +--rw private-key-\
\format? \format?
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw (private-key\ | | | | | | +--rw (private-key\
\-type) \-type)
| | | | | | | +--:(private-ke\ | | | | | | | +--:(private-ke\
\y) \y)
skipping to change at page 43, line 40 skipping to change at page 43, line 39
\rted}? \rted}?
| | | | | +--rw keystore-refere\ | | | | | +--rw keystore-refere\
\nce \nce
| | | | | +--rw asymmetric-k\ | | | | | +--rw asymmetric-k\
\ey? \ey?
| | | | | | ks:asymmet\ | | | | | | ks:asymmet\
\ric-key-ref \ric-key-ref
| | | | | +--rw certificate?\ | | | | | +--rw certificate?\
\ leafref \ leafref
| | | | +--:(raw-public-key) | | | | +--:(raw-public-key)
| | | | | +--rw raw-public-key | | | | | {raw-public-key-auth}?
| | | | | {raw-public-key-auth}? | | | | | +--rw raw-private-key
| | | | | +--rw (local-or-keystore) | | | | | +--rw (local-or-keystore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definiti\ | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw algorithm | | | | | | +--rw algorithm
| | | | | | | iasa:asymm\ | | | | | | | iasa:asymm\
\etric-algorithm-type \etric-algorithm-type
| | | | | | +--rw public-key-f\ | | | | | | +--rw public-key-f\
\ormat? \ormat
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw public-key | | | | | | +--rw public-key
| | | | | | | binary | | | | | | | binary
| | | | | | +--rw private-key-\ | | | | | | +--rw private-key-\
\format? \format?
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw (private-key\ | | | | | | +--rw (private-key\
\-type) \-type)
| | | | | | +--:(private-ke\ | | | | | | +--:(private-ke\
\y) \y)
skipping to change at page 45, line 4 skipping to change at page 44, line 51
\ue? \ue?
| | | | | | b\ | | | | | | b\
\inary \inary
| | | | | +--:(keystore) | | | | | +--:(keystore)
| | | | | {keystore-suppo\ | | | | | {keystore-suppo\
\rted}? \rted}?
| | | | | +--rw keystore-refere\ | | | | | +--rw keystore-refere\
\nce? \nce?
| | | | | ks:asymmetric\ | | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | | +--:(psk) | | | | +--:(psk) {psk-auth}?
| | | | +--rw psk {psk-auth}? | | | | +--rw psk
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definiti\ | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | isa:symmet\ | | | | | | isa:symmet\
\ric-algorithm-type \ric-algorithm-type
| | | | | +--rw key-format? | | | | | +--rw key-format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (key-type) | | | | | +--rw (key-type)
| | | | | +--:(key) | | | | | | +--:(key)
| | | | | | +--rw key? | | | | | | | +--rw key?
| | | | | | bina\ | | | | | | | bina\
\ry \ry
| | | | | +--:(hidden-key) | | | | | | +--:(hidden-key)
| | | | | | +--rw hidden\ | | | | | | | +--rw hidden\
\-key? \-key?
| | | | | | empty | | | | | | | empty
| | | | | +--:(encrypted-\ | | | | | | +--:(encrypted-\
\key) \key)
| | | | | +--rw encryp\ | | | | | | +--rw encryp\
\ted-key \ted-key
| | | | | +--rw (ke\ | | | | | | +--rw (ke\
\y-type) \y-type)
| | | | | | +--:(s\ | | | | | | | +--:(s\
\ymmetric-key-ref) \ymmetric-key-ref)
| | | | | | | +--\ | | | | | | | | +--\
\rw symmetric-key-ref? leafref \rw symmetric-key-ref? leafref
| | | | | | | \ | | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | | +--:(a\ | | | | | | | +--:(a\
\symmetric-key-ref) \symmetric-key-ref)
| | | | | | +--\ | | | | | | | +--\
\rw asymmetric-key-ref? leafref \rw asymmetric-key-ref? leafref
| | | | | | \ | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | +--rw val\ | | | | | | +--rw val\
\ue? \ue?
| | | | | b\ | | | | | | b\
\inary \inary
| | | | | +--rw id?
| | | | | string
| | | | | {ks:local-\
\definitions-supported}?
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-suppo\ | | | | {keystore-suppo\
\rted}? \rted}?
| | | | +--rw keystore-refere\ | | | | +--rw keystore-refere\
\nce? \nce?
| | | | ks:symmetric-\ | | | | ks:symmetric-\
\key-ref \key-ref
| | | +--rw server-authentication | | | +--rw server-authentication
| | | | +--rw ca-certs! | | | | +--rw ca-certs!
| | | | | {x509-certificate-auth}? | | | | | {x509-certificate-auth}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
skipping to change at page 46, line 26 skipping to change at page 46, line 30
\t-cms \t-cms
| | | | | | +---n certificate-expira\ | | | | | | +---n certificate-expira\
\tion \tion
| | | | | | +-- expiration-date | | | | | | +-- expiration-date
| | | | | | yang:date-and\ | | | | | | yang:date-and\
\-time \-time
| | | | | +--:(truststore) | | | | | +--:(truststore)
| | | | | {truststore-supported\ | | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificates-ref | | | | | ts:certificate-bag-\
\ref
| | | | +--rw server-certs! | | | | +--rw server-certs!
| | | | | {x509-certificate-auth}? | | | | | {x509-certificate-auth}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definitions-su\ | | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw cert* | | | | | | +--rw cert*
| | | | | | | trust-anchor-cer\ | | | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | | | +---n certificate-expira\ | | | | | | +---n certificate-expira\
\tion \tion
| | | | | | +-- expiration-date | | | | | | +-- expiration-date
| | | | | | yang:date-and\ | | | | | | yang:date-and\
\-time \-time
| | | | | +--:(truststore) | | | | | +--:(truststore)
| | | | | {truststore-supported\ | | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificates-ref | | | | | ts:certificate-bag-\
\ref
| | | | +--rw raw-public-keys! | | | | +--rw raw-public-keys!
| | | | | {raw-public-key-auth}? | | | | | {raw-public-key-auth}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definitions-su\ | | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw raw-public-key* | | | | | | +--rw public-key* [name]
| | | | | | [name]
| | | | | | +--rw name | | | | | | +--rw name
| | | | | | | string | | | | | | | string
| | | | | | +--rw algorithm | | | | | | +--rw algorithm
| | | | | | | iasa:asymmetr\ | | | | | | | iasa:asymmetr\
\ic-algorithm-type \ic-algorithm-type
| | | | | | +--rw public-key-form\ | | | | | | +--rw public-key-form\
\at? \at
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw public-key | | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--:(truststore) | | | | | +--:(truststore)
| | | | | {truststore-supported\ | | | | | {truststore-supported\
\,raw-public-keys}? \,public-keys}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:raw-public-keys-\ | | | | | ts:public-key-bag-r\
\ref \ef
| | | | +--rw psks! {psk-auth}? | | | | +--rw psks! {psk-auth}?
| | | +--rw hello-params | | | +--rw hello-params
| | | | {tls-client-hello-params-config\ | | | | {tls-client-hello-params-config\
\}? \}?
| | | | +--rw tls-versions | | | | +--rw tls-versions
| | | | | +--rw tls-version* identityref | | | | | +--rw tls-version* identityref
| | | | +--rw cipher-suites | | | | +--rw cipher-suites
| | | | +--rw cipher-suite* identityref | | | | +--rw cipher-suite* identityref
| | | +--rw keepalives! | | | +--rw keepalives!
| | | {tls-client-keepalives}? | | | {tls-client-keepalives}?
skipping to change at page 48, line 13 skipping to change at page 48, line 17
| | | | +--rw local-port? | | | | +--rw local-port?
| | | | | inet:port-number | | | | | inet:port-number
| | | | | {local-binding-supported}? | | | | | {local-binding-supported}?
| | | | +--rw keepalives! | | | | +--rw keepalives!
| | | | {keepalives-supported}? | | | | {keepalives-supported}?
| | | | +--rw idle-time uint16 | | | | +--rw idle-time uint16
| | | | +--rw max-probes uint16 | | | | +--rw max-probes uint16
| | | | +--rw probe-interval uint16 | | | | +--rw probe-interval uint16
| | | +--rw tls-client-parameters | | | +--rw tls-client-parameters
| | | | +--rw client-identity | | | | +--rw client-identity
| | | | | +--rw (auth-type) | | | | | +--rw (auth-type)?
| | | | | +--:(certificate) | | | | | +--:(certificate)
| | | | | | {x509-certificate-\
\auth}?
| | | | | | +--rw certificate | | | | | | +--rw certificate
| | | | | | {x509-certificat\
\e-auth}?
| | | | | | +--rw (local-or-keyst\ | | | | | | +--rw (local-or-keyst\
\ore) \ore)
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-de\ | | | | | | | {local-de\
\finitions-supported}? \finitions-supported}?
| | | | | | | +--rw local-def\ | | | | | | | +--rw local-def\
\inition \inition
| | | | | | | +--rw algori\ | | | | | | | +--rw algori\
\thm \thm
| | | | | | | | iasa\ | | | | | | | | iasa\
\:asymmetric-algorithm-type \:asymmetric-algorithm-type
| | | | | | | +--rw public\ | | | | | | | +--rw public\
\-key-format? \-key-format
| | | | | | | | iden\ | | | | | | | | iden\
\tityref \tityref
| | | | | | | +--rw public\ | | | | | | | +--rw public\
\-key \-key
| | | | | | | | bina\ | | | | | | | | bina\
\ry \ry
| | | | | | | +--rw privat\ | | | | | | | +--rw privat\
\e-key-format? \e-key-format?
| | | | | | | | iden\ | | | | | | | | iden\
\tityref \tityref
skipping to change at page 50, line 20 skipping to change at page 50, line 24
\-supported}? \-supported}?
| | | | | | +--rw keystore-\ | | | | | | +--rw keystore-\
\reference \reference
| | | | | | +--rw asymme\ | | | | | | +--rw asymme\
\tric-key? \tric-key?
| | | | | | | ks:a\ | | | | | | | ks:a\
\symmetric-key-ref \symmetric-key-ref
| | | | | | +--rw certif\ | | | | | | +--rw certif\
\icate? leafref \icate? leafref
| | | | | +--:(raw-public-key) | | | | | +--:(raw-public-key)
| | | | | | +--rw raw-public-key | | | | | | {raw-public-key-au\
| | | | | | {raw-public-key-\ \th}?
\auth}? | | | | | | +--rw raw-private-key
| | | | | | +--rw (local-or-keyst\ | | | | | | +--rw (local-or-keyst\
\ore) \ore)
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-de\ | | | | | | | {local-de\
\finitions-supported}? \finitions-supported}?
| | | | | | | +--rw local-def\ | | | | | | | +--rw local-def\
\inition \inition
| | | | | | | +--rw algori\ | | | | | | | +--rw algori\
\thm \thm
| | | | | | | | iasa\ | | | | | | | | iasa\
\:asymmetric-algorithm-type \:asymmetric-algorithm-type
| | | | | | | +--rw public\ | | | | | | | +--rw public\
\-key-format? \-key-format
| | | | | | | | iden\ | | | | | | | | iden\
\tityref \tityref
| | | | | | | +--rw public\ | | | | | | | +--rw public\
\-key \-key
| | | | | | | | bina\ | | | | | | | | bina\
\ry \ry
| | | | | | | +--rw privat\ | | | | | | | +--rw privat\
\e-key-format? \e-key-format?
| | | | | | | | iden\ | | | | | | | | iden\
\tityref \tityref
skipping to change at page 51, line 41 skipping to change at page 51, line 45
\rw value? \rw value?
| | | | | | | \ | | | | | | | \
\ binary \ binary
| | | | | | +--:(keystore) | | | | | | +--:(keystore)
| | | | | | {keystore\ | | | | | | {keystore\
\-supported}? \-supported}?
| | | | | | +--rw keystore-\ | | | | | | +--rw keystore-\
\reference? \reference?
| | | | | | ks:asym\ | | | | | | ks:asym\
\metric-key-ref \metric-key-ref
| | | | | +--:(psk) | | | | | +--:(psk) {psk-auth}?
| | | | | +--rw psk {psk-auth}? | | | | | +--rw psk
| | | | | +--rw (local-or-keyst\ | | | | | +--rw (local-or-keyst\
\ore) \ore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-de\ | | | | | | {local-de\
\finitions-supported}? \finitions-supported}?
| | | | | | +--rw local-def\ | | | | | | +--rw local-def\
\inition \inition
| | | | | | +--rw algori\ | | | | | | +--rw algori\
\thm \thm
| | | | | | | isa:\ | | | | | | | isa:\
\symmetric-algorithm-type \symmetric-algorithm-type
| | | | | | +--rw key-fo\ | | | | | | +--rw key-fo\
\rmat? \rmat?
| | | | | | | iden\ | | | | | | | iden\
\tityref \tityref
| | | | | | +--rw (key-t\ | | | | | | +--rw (key-t\
\ype) \ype)
| | | | | | +--:(key) | | | | | | | +--:(key)
| | | | | | | +--rw \ | | | | | | | | +--rw \
\key? \key?
| | | | | | | \ | | | | | | | | \
\ binary \ binary
| | | | | | +--:(hidd\ | | | | | | | +--:(hidd\
\en-key) \en-key)
| | | | | | | +--rw \ | | | | | | | | +--rw \
\hidden-key? \hidden-key?
| | | | | | | \ | | | | | | | | \
\ empty \ empty
| | | | | | +--:(encr\ | | | | | | | +--:(encr\
\ypted-key) \ypted-key)
| | | | | | +--rw \ | | | | | | | +--rw \
\encrypted-key \encrypted-key
| | | | | | +--\ | | | | | | | +--\
\rw (key-type) \rw (key-type)
| | | | | | | \ | | | | | | | | \
\+--:(symmetric-key-ref) \+--:(symmetric-key-ref)
| | | | | | | \ | | | | | | | | \
\| +--rw symmetric-key-ref? leafref \| +--rw symmetric-key-ref? leafref
| | | | | | | \ | | | | | | | | \
\| {keystore-supported}? \| {keystore-supported}?
| | | | | | | \ | | | | | | | | \
\+--:(asymmetric-key-ref) \+--:(asymmetric-key-ref)
| | | | | | | \ | | | | | | | | \
\ +--rw asymmetric-key-ref? leafref \ +--rw asymmetric-key-ref? leafref
| | | | | | | \ | | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | | +--\ | | | | | | | +--\
\rw value? \rw value?
| | | | | | \ | | | | | | | \
\ binary \ binary
| | | | | | +--rw id?
| | | | | | stri\
\ng
| | | | | | {ks:\
\local-definitions-supported}?
| | | | | +--:(keystore) | | | | | +--:(keystore)
| | | | | {keystore\ | | | | | {keystore\
\-supported}? \-supported}?
| | | | | +--rw keystore-\ | | | | | +--rw keystore-\
\reference? \reference?
| | | | | ks:symm\ | | | | | ks:symm\
\etric-key-ref \etric-key-ref
| | | | +--rw server-authentication | | | | +--rw server-authentication
| | | | | +--rw ca-certs! | | | | | +--rw ca-certs!
| | | | | | {x509-certificate-auth\ | | | | | | {x509-certificate-auth\
skipping to change at page 53, line 28 skipping to change at page 53, line 37
| | | | | | | +-- expiration-\ | | | | | | | +-- expiration-\
\date \date
| | | | | | | yang:da\ | | | | | | | yang:da\
\te-and-time \te-and-time
| | | | | | +--:(truststore) | | | | | | +--:(truststore)
| | | | | | {truststore-sup\ | | | | | | {truststore-sup\
\ported,x509-certificates}? \ported,x509-certificates}?
| | | | | | +--rw truststore-refe\ | | | | | | +--rw truststore-refe\
\rence? \rence?
| | | | | | ts:certificat\ | | | | | | ts:certificat\
\es-ref \e-bag-ref
| | | | | +--rw server-certs! | | | | | +--rw server-certs!
| | | | | | {x509-certificate-auth\ | | | | | | {x509-certificate-auth\
\}? \}?
| | | | | | +--rw (local-or-truststore) | | | | | | +--rw (local-or-truststore)
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-definiti\ | | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | | +--rw local-definition | | | | | | | +--rw local-definition
| | | | | | | +--rw cert* | | | | | | | +--rw cert*
| | | | | | | | trust-anch\ | | | | | | | | trust-anch\
skipping to change at page 53, line 43 skipping to change at page 54, line 4
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-definiti\ | | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | | +--rw local-definition | | | | | | | +--rw local-definition
| | | | | | | +--rw cert* | | | | | | | +--rw cert*
| | | | | | | | trust-anch\ | | | | | | | | trust-anch\
\or-cert-cms \or-cert-cms
| | | | | | | +---n certificate-\ | | | | | | | +---n certificate-\
\expiration \expiration
| | | | | | | +-- expiration-\ | | | | | | | +-- expiration-\
\date \date
| | | | | | | yang:da\ | | | | | | | yang:da\
\te-and-time \te-and-time
| | | | | | +--:(truststore) | | | | | | +--:(truststore)
| | | | | | {truststore-sup\ | | | | | | {truststore-sup\
\ported,x509-certificates}? \ported,x509-certificates}?
| | | | | | +--rw truststore-refe\ | | | | | | +--rw truststore-refe\
\rence? \rence?
| | | | | | ts:certificat\ | | | | | | ts:certificat\
\e-bag-ref
\es-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-definiti\ | | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | | +--rw local-definition | | | | | | | +--rw local-definition
| | | | | | | +--rw raw-public-k\ | | | | | | | +--rw public-key*
\ey*
| | | | | | | [name] | | | | | | | [name]
| | | | | | | +--rw name | | | | | | | +--rw name
| | | | | | | | string | | | | | | | | string
| | | | | | | +--rw algorithm | | | | | | | +--rw algorithm
| | | | | | | | iasa:as\ | | | | | | | | iasa:as\
\ymmetric-algorithm-type \ymmetric-algorithm-type
| | | | | | | +--rw public-ke\ | | | | | | | +--rw public-ke\
\y-format? \y-format
| | | | | | | | identit\ | | | | | | | | identit\
\yref \yref
| | | | | | | +--rw public-key | | | | | | | +--rw public-key
| | | | | | | binary | | | | | | | binary
| | | | | | +--:(truststore) | | | | | | +--:(truststore)
| | | | | | {truststore-sup\ | | | | | | {truststore-sup\
\ported,raw-public-keys}? \ported,public-keys}?
| | | | | | +--rw truststore-refe\ | | | | | | +--rw truststore-refe\
\rence? \rence?
| | | | | | ts:raw-public\ | | | | | | ts:public-key\
\-keys-ref \-bag-ref
| | | | | +--rw psks! {psk-auth}? | | | | | +--rw psks! {psk-auth}?
| | | | +--rw hello-params | | | | +--rw hello-params
| | | | | {tls-client-hello-params-\ | | | | | {tls-client-hello-params-\
\config}? \config}?
| | | | | +--rw tls-versions | | | | | +--rw tls-versions
| | | | | | +--rw tls-version* | | | | | | +--rw tls-version*
| | | | | | identityref | | | | | | identityref
| | | | | +--rw cipher-suites | | | | | +--rw cipher-suites
| | | | | +--rw cipher-suite* | | | | | +--rw cipher-suite*
| | | | | identityref | | | | | identityref
skipping to change at page 55, line 36 skipping to change at page 55, line 44
+--rw https +--rw https
+--rw tcp-server-parameters +--rw tcp-server-parameters
| +--rw local-address inet:ip-address | +--rw local-address inet:ip-address
| +--rw local-port? inet:port-number | +--rw local-port? inet:port-number
| +--rw keepalives! {keepalives-supported}? | +--rw keepalives! {keepalives-supported}?
| +--rw idle-time uint16 | +--rw idle-time uint16
| +--rw max-probes uint16 | +--rw max-probes uint16
| +--rw probe-interval uint16 | +--rw probe-interval uint16
+--rw tls-client-parameters +--rw tls-client-parameters
| +--rw client-identity | +--rw client-identity
| | +--rw (auth-type) | | +--rw (auth-type)?
| | +--:(certificate) | | +--:(certificate)
| | | {x509-certificate-auth}?
| | | +--rw certificate | | | +--rw certificate
| | | {x509-certificate-auth}?
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-su\ | | | | {local-definitions-su\
\pported}? \pported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | iasa:asymmetric-\ | | | | | iasa:asymmetric-\
\algorithm-type \algorithm-type
| | | | +--rw public-key-format? | | | | +--rw public-key-format
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format? | | | | +--rw private-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
| | | | | +--:(hidden-private-k\ | | | | | +--:(hidden-private-k\
skipping to change at page 57, line 14 skipping to change at page 57, line 22
| | | | binary | | | | binary
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-supported}? | | | {keystore-supported}?
| | | +--rw keystore-reference | | | +--rw keystore-reference
| | | +--rw asymmetric-key? | | | +--rw asymmetric-key?
| | | | ks:asymmetric-ke\ | | | | ks:asymmetric-ke\
\y-ref \y-ref
| | | +--rw certificate? \ | | | +--rw certificate? \
\leafref \leafref
| | +--:(raw-public-key) | | +--:(raw-public-key)
| | | +--rw raw-public-key | | | {raw-public-key-auth}?
| | | {raw-public-key-auth}? | | | +--rw raw-private-key
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-su\ | | | | {local-definitions-su\
\pported}? \pported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | iasa:asymmetric-\ | | | | | iasa:asymmetric-\
\algorithm-type \algorithm-type
| | | | +--rw public-key-format? | | | | +--rw public-key-format
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format? | | | | +--rw private-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | +--:(private-key) | | | | +--:(private-key)
| | | | | +--rw private-key? | | | | | +--rw private-key?
| | | | | binary | | | | | binary
| | | | +--:(hidden-private-k\ | | | | +--:(hidden-private-k\
skipping to change at page 58, line 15 skipping to change at page 58, line 23
\mmetric-key-ref? leafref \mmetric-key-ref? leafref
| | | | | {\ | | | | | {\
\keystore-supported}? \keystore-supported}?
| | | | +--rw value? | | | | +--rw value?
| | | | binary | | | | binary
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-supported}? | | | {keystore-supported}?
| | | +--rw keystore-reference? | | | +--rw keystore-reference?
| | | ks:asymmetric-key-r\ | | | ks:asymmetric-key-r\
\ef \ef
| | +--:(psk) | | +--:(psk) {psk-auth}?
| | +--rw psk {psk-auth}? | | +--rw psk
| | +--rw (local-or-keystore) | | +--rw (local-or-keystore)
| | +--:(local) | | +--:(local)
| | | {local-definitions-su\ | | | {local-definitions-su\
\pported}? \pported}?
| | | +--rw local-definition | | | +--rw local-definition
| | | +--rw algorithm | | | +--rw algorithm
| | | | isa:symmetric-al\ | | | | isa:symmetric-al\
\gorithm-type \gorithm-type
| | | +--rw key-format? | | | +--rw key-format?
| | | | identityref | | | | identityref
| | | +--rw (key-type) | | | +--rw (key-type)
| | | +--:(key) | | | | +--:(key)
| | | | +--rw key? | | | | | +--rw key?
| | | | binary | | | | | binary
| | | +--:(hidden-key) | | | | +--:(hidden-key)
| | | | +--rw hidden-key? | | | | | +--rw hidden-key?
| | | | empty | | | | | empty
| | | +--:(encrypted-key) | | | | +--:(encrypted-key)
| | | +--rw encrypted-key | | | | +--rw encrypted-key
| | | +--rw (key-type) | | | | +--rw (key-type)
| | | | +--:(symmetr\ | | | | | +--:(symmetr\
\ic-key-ref) \ic-key-ref)
| | | | | +--rw sym\ | | | | | | +--rw sym\
\metric-key-ref? leafref \metric-key-ref? leafref
| | | | | {\ | | | | | | {\
\keystore-supported}? \keystore-supported}?
| | | | +--:(asymmet\ | | | | | +--:(asymmet\
\ric-key-ref) \ric-key-ref)
| | | | +--rw asy\ | | | | | +--rw asy\
\mmetric-key-ref? leafref \mmetric-key-ref? leafref
| | | | {\ | | | | | {\
\keystore-supported}? \keystore-supported}?
| | | +--rw value? | | | | +--rw value?
| | | binary | | | | binary
| | | +--rw id?
| | | string
| | | {ks:local-defini\
\tions-supported}?
| | +--:(keystore) | | +--:(keystore)
| | {keystore-supported}? | | {keystore-supported}?
| | +--rw keystore-reference? | | +--rw keystore-reference?
| | ks:symmetric-key-ref | | ks:symmetric-key-ref
| +--rw server-authentication | +--rw server-authentication
| | +--rw ca-certs! {x509-certificate-auth}? | | +--rw ca-certs! {x509-certificate-auth}?
| | | +--rw (local-or-truststore) | | | +--rw (local-or-truststore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-supporte\ | | | | {local-definitions-supporte\
\d}? \d}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw cert* | | | | +--rw cert*
| | | | | trust-anchor-cert-cms | | | | | trust-anchor-cert-cms
| | | | +---n certificate-expiration | | | | +---n certificate-expiration
| | | | +-- expiration-date | | | | +-- expiration-date
| | | | yang:date-and-time | | | | yang:date-and-time
| | | +--:(truststore) | | | +--:(truststore)
| | | {truststore-supported,x509-\ | | | {truststore-supported,x509-\
\certificates}? \certificates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificates-ref | | | ts:certificate-bag-ref
| | +--rw server-certs! | | +--rw server-certs!
| | | {x509-certificate-auth}? | | | {x509-certificate-auth}?
| | | +--rw (local-or-truststore) | | | +--rw (local-or-truststore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-supporte\ | | | | {local-definitions-supporte\
\d}? \d}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw cert* | | | | +--rw cert*
| | | | | trust-anchor-cert-cms | | | | | trust-anchor-cert-cms
| | | | +---n certificate-expiration | | | | +---n certificate-expiration
| | | | +-- expiration-date | | | | +-- expiration-date
| | | | yang:date-and-time | | | | yang:date-and-time
| | | +--:(truststore) | | | +--:(truststore)
| | | {truststore-supported,x509-\ | | | {truststore-supported,x509-\
\certificates}? \certificates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificates-ref | | | ts:certificate-bag-ref
| | +--rw raw-public-keys! | | +--rw raw-public-keys!
| | | {raw-public-key-auth}? | | | {raw-public-key-auth}?
| | | +--rw (local-or-truststore) | | | +--rw (local-or-truststore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-supporte\ | | | | {local-definitions-supporte\
\d}? \d}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw raw-public-key* [name] | | | | +--rw public-key* [name]
| | | | +--rw name | | | | +--rw name
| | | | | string | | | | | string
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | iasa:asymmetric-alg\ | | | | | iasa:asymmetric-alg\
\orithm-type \orithm-type
| | | | +--rw public-key-format? | | | | +--rw public-key-format
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | binary | | | | binary
| | | +--:(truststore) | | | +--:(truststore)
| | | {truststore-supported,raw-p\ | | | {truststore-supported,publi\
\ublic-keys}? \c-keys}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:raw-public-keys-ref | | | ts:public-key-bag-ref
| | +--rw psks! {psk-auth}? | | +--rw psks! {psk-auth}?
| +--rw hello-params | +--rw hello-params
| | {tls-client-hello-params-config}? | | {tls-client-hello-params-config}?
| | +--rw tls-versions | | +--rw tls-versions
| | | +--rw tls-version* identityref | | | +--rw tls-version* identityref
| | +--rw cipher-suites | | +--rw cipher-suites
| | +--rw cipher-suite* identityref | | +--rw cipher-suite* identityref
| +--rw keepalives! {tls-client-keepalives}? | +--rw keepalives! {tls-client-keepalives}?
| +--rw max-wait? uint16 | +--rw max-wait? uint16
| +--rw max-attempts? uint8 | +--rw max-attempts? uint8
skipping to change at page 60, line 47 skipping to change at page 61, line 11
| | | {local-binding-supported}? | | | {local-binding-supported}?
| | +--rw local-port? inet:port-number | | +--rw local-port? inet:port-number
| | | {local-binding-supported}? | | | {local-binding-supported}?
| | +--rw keepalives! | | +--rw keepalives!
| | {keepalives-supported}? | | {keepalives-supported}?
| | +--rw idle-time uint16 | | +--rw idle-time uint16
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-client-parameters | +--rw tls-client-parameters
| | +--rw client-identity | | +--rw client-identity
| | | +--rw (auth-type) | | | +--rw (auth-type)?
| | | +--:(certificate) | | | +--:(certificate)
| | | | {x509-certificate-auth}?
| | | | +--rw certificate | | | | +--rw certificate
| | | | {x509-certificate-auth\
\}?
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definiti\ | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymm\ | | | | | | iasa:asymm\
\etric-algorithm-type \etric-algorithm-type
| | | | | +--rw public-key-f\ | | | | | +--rw public-key-f\
\ormat? \ormat
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-\ | | | | | +--rw private-key-\
\format? \format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key\ | | | | | +--rw (private-key\
\-type) \-type)
| | | | | | +--:(private-ke\ | | | | | | +--:(private-ke\
\y) \y)
skipping to change at page 62, line 42 skipping to change at page 63, line 4
| | | | +--:(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)
| | | | +--rw raw-public-key | | | | {raw-public-key-auth}?
| | | | {raw-public-key-auth}? | | | | +--rw raw-private-key
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definiti\ | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymm\ | | | | | | iasa:asymm\
\etric-algorithm-type \etric-algorithm-type
| | | | | +--rw public-key-f\ | | | | | +--rw public-key-f\
\ormat? \ormat
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-\ | | | | | +--rw private-key-\
\format? \format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key\ | | | | | +--rw (private-key\
\-type) \-type)
| | | | | +--:(private-ke\ | | | | | +--:(private-ke\
\y) \y)
skipping to change at page 64, line 4 skipping to change at page 64, line 16
| | | | | | \ | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | +--rw val\ | | | | | +--rw val\
\ue? \ue?
| | | | | b\ | | | | | b\
\inary \inary
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-suppo\ | | | | {keystore-suppo\
\rted}? \rted}?
| | | | +--rw keystore-refere\ | | | | +--rw keystore-refere\
\nce? \nce?
| | | | ks:asymmetric\ | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | +--:(psk) | | | +--:(psk) {psk-auth}?
| | | +--rw psk {psk-auth}? | | | +--rw psk
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definiti\ | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | isa:symmet\ | | | | | isa:symmet\
\ric-algorithm-type \ric-algorithm-type
| | | | +--rw key-format? | | | | +--rw key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (key-type) | | | | +--rw (key-type)
| | | | +--:(key) | | | | | +--:(key)
| | | | | +--rw key? | | | | | | +--rw key?
| | | | | bina\ | | | | | | bina\
\ry \ry
| | | | +--:(hidden-key) | | | | | +--:(hidden-key)
| | | | | +--rw hidden\ | | | | | | +--rw hidden\
\-key? \-key?
| | | | | empty | | | | | | empty
| | | | +--:(encrypted-\ | | | | | +--:(encrypted-\
\key) \key)
| | | | +--rw encryp\ | | | | | +--rw encryp\
\ted-key \ted-key
| | | | +--rw (ke\ | | | | | +--rw (ke\
\y-type) \y-type)
| | | | | +--:(s\ | | | | | | +--:(s\
\ymmetric-key-ref) \ymmetric-key-ref)
| | | | | | +--\ | | | | | | | +--\
\rw symmetric-key-ref? leafref \rw symmetric-key-ref? leafref
| | | | | | \ | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | +--:(a\ | | | | | | +--:(a\
\symmetric-key-ref) \symmetric-key-ref)
| | | | | +--\ | | | | | | +--\
\rw asymmetric-key-ref? leafref \rw asymmetric-key-ref? leafref
| | | | | \ | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | +--rw val\ | | | | | +--rw val\
\ue? \ue?
| | | | b\ | | | | | b\
\inary \inary
| | | | +--rw id?
| | | | string
| | | | {ks:local-\
\definitions-supported}?
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-suppo\ | | | {keystore-suppo\
\rted}? \rted}?
| | | +--rw keystore-refere\ | | | +--rw keystore-refere\
\nce? \nce?
| | | ks:symmetric-\ | | | ks:symmetric-\
\key-ref \key-ref
| | +--rw 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)
skipping to change at page 65, line 30 skipping to change at page 65, line 45
\t-cms \t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and\ | | | | | yang:date-and\
\-time \-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported\ | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificate-bag-\
\ref
| | | +--rw server-certs! | | | +--rw server-certs!
| | | | {x509-certificate-auth}? | | | | {x509-certificate-auth}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cer\ | | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and\ | | | | | yang:date-and\
\-time \-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported\ | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificate-bag-\
\ref
| | | +--rw raw-public-keys! | | | +--rw raw-public-keys!
| | | | {raw-public-key-auth}? | | | | {raw-public-key-auth}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw raw-public-key* | | | | | +--rw public-key* [name]
| | | | | [name]
| | | | | +--rw name | | | | | +--rw name
| | | | | | string | | | | | | string
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymmetr\ | | | | | | iasa:asymmetr\
\ic-algorithm-type \ic-algorithm-type
| | | | | +--rw public-key-form\ | | | | | +--rw public-key-form\
\at? \at
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported\ | | | | {truststore-supported\
\,raw-public-keys}? \,public-keys}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:raw-public-keys-\ | | | | ts:public-key-bag-r\
\ref \ef
| | | +--rw psks! {psk-auth}? | | | +--rw psks! {psk-auth}?
| | +--rw hello-params | | +--rw hello-params
| | | {tls-client-hello-params-config\ | | | {tls-client-hello-params-config\
\}? \}?
| | | +--rw tls-versions | | | +--rw tls-versions
| | | | +--rw tls-version* identityref | | | | +--rw tls-version* identityref
| | | +--rw cipher-suites | | | +--rw cipher-suites
| | | +--rw cipher-suite* identityref | | | +--rw cipher-suite* identityref
| | +--rw keepalives! | | +--rw keepalives!
| | {tls-client-keepalives}? | | {tls-client-keepalives}?
skipping to change at page 68, line 18 skipping to change at page 68, line 34
| | +--rw local-address inet:ip-address | | +--rw local-address inet:ip-address
| | +--rw local-port? inet:port-number | | +--rw local-port? inet:port-number
| | +--rw keepalives! {keepalives-supported}? | | +--rw keepalives! {keepalives-supported}?
| | +--rw idle-time uint16 | | +--rw idle-time uint16
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-server-parameters | +--rw tls-server-parameters
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (auth-type) | | | +--rw (auth-type)
| | | +--:(certificate) | | | +--:(certificate)
| | | | {x509-certificate-auth}?
| | | | +--rw certificate | | | | +--rw certificate
| | | | {x509-certificate-auth}?
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymmetric-\ | | | | | | iasa:asymmetric-\
\algorithm-type \algorithm-type
| | | | | +--rw public-key-format? | | | | | +--rw public-key-format
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-format? | | | | | +--rw private-key-format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key-type) | | | | | +--rw (private-key-type)
| | | | | | +--:(private-key) | | | | | | +--:(private-key)
| | | | | | | +--rw private-key? | | | | | | | +--rw private-key?
| | | | | | | binary | | | | | | | binary
| | | | | | +--:(hidden-private-k\ | | | | | | +--:(hidden-private-k\
skipping to change at page 69, line 42 skipping to change at page 70, line 10
| | | | | binary | | | | | binary
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-supported}? | | | | {keystore-supported}?
| | | | +--rw keystore-reference | | | | +--rw keystore-reference
| | | | +--rw asymmetric-key? | | | | +--rw asymmetric-key?
| | | | | ks:asymmetric-ke\ | | | | | ks:asymmetric-ke\
\y-ref \y-ref
| | | | +--rw certificate? \ | | | | +--rw certificate? \
\leafref \leafref
| | | +--:(raw-private-key) | | | +--:(raw-private-key)
| | | | {raw-public-key-auth}?
| | | | +--rw raw-private-key | | | | +--rw raw-private-key
| | | | {raw-public-key-auth}?
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymmetric-\ | | | | | | iasa:asymmetric-\
\algorithm-type \algorithm-type
| | | | | +--rw public-key-format? | | | | | +--rw public-key-format
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-format? | | | | | +--rw private-key-format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key-type) | | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
| | | | | +--:(hidden-private-k\ | | | | | +--:(hidden-private-k\
skipping to change at page 70, line 43 skipping to change at page 71, line 11
\mmetric-key-ref? leafref \mmetric-key-ref? leafref
| | | | | | {\ | | | | | | {\
\keystore-supported}? \keystore-supported}?
| | | | | +--rw value? | | | | | +--rw value?
| | | | | binary | | | | | binary
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-supported}? | | | | {keystore-supported}?
| | | | +--rw keystore-reference? | | | | +--rw keystore-reference?
| | | | ks:asymmetric-key-r\ | | | | ks:asymmetric-key-r\
\ef \ef
| | | +--:(psk) | | | +--:(psk) {psk-auth}?
| | | +--rw psk {psk-auth}? | | | +--rw psk
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-su\ | | | | {local-definitions-su\
\pported}? \pported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | isa:symmetric-al\ | | | | | isa:symmetric-al\
\gorithm-type \gorithm-type
| | | | +--rw key-format? | | | | +--rw key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (key-type) | | | | +--rw (key-type)
| | | | +--:(key) | | | | | +--:(key)
| | | | | +--rw key? | | | | | | +--rw key?
| | | | | binary | | | | | | binary
| | | | +--:(hidden-key) | | | | | +--:(hidden-key)
| | | | | +--rw hidden-key? | | | | | | +--rw hidden-key?
| | | | | empty | | | | | | empty
| | | | +--:(encrypted-key) | | | | | +--:(encrypted-key)
| | | | +--rw encrypted-key | | | | | +--rw encrypted-key
| | | | +--rw (key-type) | | | | | +--rw (key-type)
| | | | | +--:(symmetr\ | | | | | | +--:(symmetr\
\ic-key-ref) \ic-key-ref)
| | | | | | +--rw sym\ | | | | | | | +--rw sym\
\metric-key-ref? leafref \metric-key-ref? leafref
| | | | | | {\ | | | | | | | {\
\keystore-supported}? \keystore-supported}?
| | | | | +--:(asymmet\ | | | | | | +--:(asymmet\
\ric-key-ref) \ric-key-ref)
| | | | | +--rw asy\ | | | | | | +--rw asy\
\mmetric-key-ref? leafref \mmetric-key-ref? leafref
| | | | | {\ | | | | | | {\
\keystore-supported}? \keystore-supported}?
| | | | +--rw value? | | | | | +--rw value?
| | | | binary | | | | | binary
| | | | +--rw id?
| | | | string
| | | | {ks:local-defini\
\tions-supported}?
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-supported}? | | | {keystore-supported}?
| | | +--rw keystore-reference? | | | +--rw keystore-reference?
| | | ks:symmetric-key-ref | | | ks:symmetric-key-ref
| | +--rw client-authentication! | | +--rw client-authentication!
| | | {client-auth-config-supported}? | | | {client-auth-config-supported}?
| | | +--rw ca-certs! {x509-certificate-auth}? | | | +--rw ca-certs! {x509-certificate-auth}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-supporte\ | | | | | {local-definitions-supporte\
skipping to change at page 72, line 4 skipping to change at page 72, line 24
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cert-cms | | | | | | trust-anchor-cert-cms
| | | | | +---n certificate-expiration | | | | | +---n certificate-expiration
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and-time | | | | | yang:date-and-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported,x509-\ | | | | {truststore-supported,x509-\
\certificates}? \certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificate-bag-ref
| | | +--rw client-certs! | | | +--rw client-certs!
| | | | {x509-certificate-auth}? | | | | {x509-certificate-auth}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-supporte\ | | | | | {local-definitions-supporte\
\d}? \d}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cert-cms | | | | | | trust-anchor-cert-cms
| | | | | +---n certificate-expiration | | | | | +---n certificate-expiration
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and-time | | | | | yang:date-and-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported,x509-\ | | | | {truststore-supported,x509-\
\certificates}? \certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificate-bag-ref
| | | +--rw raw-public-keys! | | | +--rw raw-public-keys!
| | | {raw-public-key-auth}? | | | | {raw-public-key-auth}?
| | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | +--:(local) | | | | +--:(local)
| | | | {local-definitions-supporte\ | | | | | {local-definitions-supporte\
\d}? \d}?
| | | | +--rw local-definition | | | | | +--rw local-definition
| | | | +--rw raw-public-key* [name] | | | | | +--rw public-key* [name]
| | | | +--rw name | | | | | +--rw name
| | | | | string | | | | | | string
| | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | iasa:asymmetric-alg\ | | | | | | iasa:asymmetric-alg\
\orithm-type \orithm-type
| | | | +--rw public-key-format? | | | | | +--rw public-key-format
| | | | | identityref | | | | | | identityref
| | | | +--rw public-key | | | | | +--rw public-key
| | | | binary | | | | | binary
| | | +--:(truststore) | | | | +--:(truststore)
| | | {truststore-supported,raw-p\ | | | | {truststore-supported,publi\
\ublic-keys}? \c-keys}?
| | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | ts:raw-public-keys-ref | | | | ts:public-key-bag-ref
| | | +--rw psks! {psk-auth}?
| | +--rw hello-params | | +--rw hello-params
| | | {tls-server-hello-params-config}? | | | {tls-server-hello-params-config}?
| | | +--rw tls-versions | | | +--rw tls-versions
| | | | +--rw tls-version* identityref | | | | +--rw tls-version* identityref
| | | +--rw cipher-suites | | | +--rw cipher-suites
| | | +--rw cipher-suite* identityref | | | +--rw cipher-suite* identityref
| | +--rw keepalives! {tls-server-keepalives}? | | +--rw keepalives! {tls-server-keepalives}?
| | +--rw max-wait? uint16 | | +--rw max-wait? uint16
| | +--rw max-attempts? uint8 | | +--rw max-attempts? uint8
| +--rw http-server-parameters | +--rw http-server-parameters
skipping to change at page 74, line 5 skipping to change at page 74, line 26
| | | {local-binding-supported}? | | | {local-binding-supported}?
| | +--rw keepalives! | | +--rw keepalives!
| | {keepalives-supported}? | | {keepalives-supported}?
| | +--rw idle-time uint16 | | +--rw idle-time uint16
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-server-parameters | +--rw tls-server-parameters
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (auth-type) | | | +--rw (auth-type)
| | | +--:(certificate) | | | +--:(certificate)
| | | | {x509-certificate-auth}?
| | | | +--rw certificate | | | | +--rw certificate
| | | | {x509-certificate-auth\
\}?
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definiti\ | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymm\ | | | | | | iasa:asymm\
\etric-algorithm-type \etric-algorithm-type
| | | | | +--rw public-key-f\ | | | | | +--rw public-key-f\
\ormat? \ormat
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-\ | | | | | +--rw private-key-\
\format? \format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key\ | | | | | +--rw (private-key\
\-type) \-type)
| | | | | | +--:(private-ke\ | | | | | | +--:(private-ke\
\y) \y)
skipping to change at page 75, line 48 skipping to change at page 76, line 20
\rted}? \rted}?
| | | | +--rw keystore-refere\ | | | | +--rw keystore-refere\
\nce \nce
| | | | +--rw asymmetric-k\ | | | | +--rw asymmetric-k\
\ey? \ey?
| | | | | ks:asymmet\ | | | | | ks:asymmet\
\ric-key-ref \ric-key-ref
| | | | +--rw certificate?\ | | | | +--rw certificate?\
\ leafref \ leafref
| | | +--:(raw-private-key) | | | +--:(raw-private-key)
| | | | {raw-public-key-auth}?
| | | | +--rw raw-private-key | | | | +--rw raw-private-key
| | | | {raw-public-key-auth}?
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definiti\ | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | iasa:asymm\ | | | | | | iasa:asymm\
\etric-algorithm-type \etric-algorithm-type
| | | | | +--rw public-key-f\ | | | | | +--rw public-key-f\
\ormat? \ormat
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-\ | | | | | +--rw private-key-\
\format? \format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key\ | | | | | +--rw (private-key\
\-type) \-type)
| | | | | +--:(private-ke\ | | | | | +--:(private-ke\
\y) \y)
skipping to change at page 77, line 11 skipping to change at page 77, line 31
\ue? \ue?
| | | | | b\ | | | | | b\
\inary \inary
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-suppo\ | | | | {keystore-suppo\
\rted}? \rted}?
| | | | +--rw keystore-refere\ | | | | +--rw keystore-refere\
\nce? \nce?
| | | | ks:asymmetric\ | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | +--:(psk) | | | +--:(psk) {psk-auth}?
| | | +--rw psk {psk-auth}? | | | +--rw psk
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definiti\ | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | isa:symmet\ | | | | | isa:symmet\
\ric-algorithm-type \ric-algorithm-type
| | | | +--rw key-format? | | | | +--rw key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (key-type) | | | | +--rw (key-type)
| | | | +--:(key) | | | | | +--:(key)
| | | | | +--rw key? | | | | | | +--rw key?
| | | | | bina\ | | | | | | bina\
\ry \ry
| | | | +--:(hidden-key) | | | | | +--:(hidden-key)
| | | | | +--rw hidden\ | | | | | | +--rw hidden\
\-key? \-key?
| | | | | empty | | | | | | empty
| | | | +--:(encrypted-\ | | | | | +--:(encrypted-\
\key) \key)
| | | | +--rw encryp\ | | | | | +--rw encryp\
\ted-key \ted-key
| | | | +--rw (ke\ | | | | | +--rw (ke\
\y-type) \y-type)
| | | | | +--:(s\ | | | | | | +--:(s\
\ymmetric-key-ref) \ymmetric-key-ref)
| | | | | | +--\ | | | | | | | +--\
\rw symmetric-key-ref? leafref \rw symmetric-key-ref? leafref
| | | | | | \ | | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | | +--:(a\ | | | | | | +--:(a\
\symmetric-key-ref) \symmetric-key-ref)
| | | | | +--\ | | | | | | +--\
\rw asymmetric-key-ref? leafref \rw asymmetric-key-ref? leafref
| | | | | \ | | | | | | \
\ {keystore-supported}? \ {keystore-supported}?
| | | | +--rw val\ | | | | | +--rw val\
\ue? \ue?
| | | | b\ | | | | | b\
\inary \inary
| | | | +--rw id?
| | | | string
| | | | {ks:local-\
\definitions-supported}?
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-suppo\ | | | {keystore-suppo\
\rted}? \rted}?
| | | +--rw keystore-refere\ | | | +--rw keystore-refere\
\nce? \nce?
| | | ks:symmetric-\ | | | ks:symmetric-\
\key-ref \key-ref
| | +--rw client-authentication! | | +--rw client-authentication!
| | | {client-auth-config-supported}? | | | {client-auth-config-supported}?
| | | +--rw ca-certs! | | | +--rw ca-certs!
skipping to change at page 78, line 34 skipping to change at page 79, line 10
\t-cms \t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and\ | | | | | yang:date-and\
\-time \-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported\ | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificate-bag-\
\ref
| | | +--rw client-certs! | | | +--rw client-certs!
| | | | {x509-certificate-auth}? | | | | {x509-certificate-auth}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cer\ | | | | | | trust-anchor-cer\
\t-cms \t-cms
skipping to change at page 79, line 4 skipping to change at page 79, line 29
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cer\ | | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and\ | | | | | yang:date-and\
\-time \-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported\ | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificate-bag-\
\ref
| | | +--rw raw-public-keys! | | | +--rw raw-public-keys!
| | | {raw-public-key-auth}? | | | | {raw-public-key-auth}?
| | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | +--:(local) | | | | +--:(local)
| | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | +--rw local-definition | | | | | +--rw local-definition
| | | | +--rw raw-public-key* | | | | | +--rw public-key* [name]
| | | | [name] | | | | | +--rw name
| | | | +--rw name | | | | | | string
| | | | | string | | | | | +--rw algorithm
| | | | +--rw algorithm | | | | | | iasa:asymmetr\
| | | | | iasa:asymmetr\
\ic-algorithm-type \ic-algorithm-type
| | | | +--rw public-key-form\ | | | | | +--rw public-key-form\
\at? \at
| | | | | identityref | | | | | | identityref
| | | | +--rw public-key | | | | | +--rw public-key
| | | | binary | | | | | binary
| | | +--:(truststore) | | | | +--:(truststore)
| | | {truststore-supported\ | | | | {truststore-supported\
\,raw-public-keys}? \,public-keys}?
| | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | ts:raw-public-keys-\ | | | | ts:public-key-bag-r\
\ref \ef
| | | +--rw psks! {psk-auth}?
| | +--rw hello-params | | +--rw hello-params
| | | {tls-server-hello-params-config\ | | | {tls-server-hello-params-config\
\}? \}?
| | | +--rw tls-versions | | | +--rw tls-versions
| | | | +--rw tls-version* identityref | | | | +--rw tls-version* identityref
| | | +--rw cipher-suites | | | +--rw cipher-suites
| | | +--rw cipher-suite* identityref | | | +--rw cipher-suite* identityref
| | +--rw keepalives! | | +--rw keepalives!
| | {tls-server-keepalives}? | | {tls-server-keepalives}?
| | +--rw max-wait? uint16 | | +--rw max-wait? uint16
skipping to change at page 84, line 22 skipping to change at page 85, line 5
o Updated restconf-client example to reflect that http-client- o Updated restconf-client example to reflect that http-client-
grouping no longer has a "protocol-version" leaf. grouping no longer has a "protocol-version" leaf.
B.17. 16 to 17 B.17. 16 to 17
o Updated examples to include the "*-key-format" nodes. o Updated examples to include the "*-key-format" nodes.
o Updated examples to remove the "required" nodes. o Updated examples to remove the "required" nodes.
B.18. 17 to 18
o Updated examples to reflect new "bag" addition to truststore.
Acknowledgements Acknowledgements
The authors would like to thank for following for lively discussions The authors would like to thank for following for lively discussions
on list and in the halls (ordered by first name): Alan Luchuk, Andy on list and in the halls (ordered by first name): Alan Luchuk, Andy
Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter, Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter,
Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet
Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and
Tom Petch. Tom Petch.
Author's Address Author's Address
 End of changes. 198 change blocks. 
304 lines changed or deleted 322 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/