draft-ietf-netconf-crypto-types-12.txt   draft-ietf-netconf-crypto-types-13.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Watsen Networks Internet-Draft Watsen Networks
Intended status: Standards Track H. Wang Intended status: Standards Track H. Wang
Expires: May 4, 2020 Huawei Expires: May 23, 2020 Huawei
November 1, 2019 November 20, 2019
Common YANG Data Types for Cryptography Common YANG Data Types for Cryptography
draft-ietf-netconf-crypto-types-12 draft-ietf-netconf-crypto-types-13
Abstract Abstract
This document defines four YANG modules for types useful to This document defines four YANG modules for types useful to
cryptographic applications. The modules defined include: cryptographic applications. The modules defined include:
o ietf-crypto-types o ietf-crypto-types
o iana-symmetric-algs o iana-symmetric-algs
skipping to change at page 1, line 40 skipping to change at page 1, line 40
Editor instructions are specified elsewhere in this document. Editor instructions are specified elsewhere in this document.
Artwork in this document contains shorthand references to drafts in Artwork in this document contains shorthand references to drafts in
progress. Please apply the following replacements: progress. Please apply the following replacements:
o "XXXX" --> the assigned RFC value for this draft o "XXXX" --> 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 "2019-11-02" --> the publication date of this draft o "2019-11-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
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 4, 2020. This Internet-Draft will expire on May 23, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2019 IETF Trust and the persons identified as the Copyright (c) 2019 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
skipping to change at page 2, line 43 skipping to change at page 2, line 43
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 . . . . . . . . . . . . . . . . . . . . . . . . 3
2. The Crypto Types Module . . . . . . . . . . . . . . . . . . . 4 2. The Crypto Types Module . . . . . . . . . . . . . . . . . . . 4
2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4
2.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 6 2.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 6
2.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 23 2.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 24
3. The Symmetric Algorithms Module . . . . . . . . . . . . . . . 27 3. The Symmetric Algorithms Module . . . . . . . . . . . . . . . 28
3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 27 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 28
3.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 27 3.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 28
3.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 31 3.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 32
4. The Asymmetric Algorithms Module . . . . . . . . . . . . . . 31 4. The Asymmetric Algorithms Module . . . . . . . . . . . . . . 32
4.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 31 4.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 32
4.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 32 4.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 33
4.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 36 4.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 37
5. The Hash Algorithms Module . . . . . . . . . . . . . . . . . 36 5. The Hash Algorithms Module . . . . . . . . . . . . . . . . . 37
5.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 36 5.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 37
5.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 36 5.2. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 38
5.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 40 5.3. Examples . . . . . . . . . . . . . . . . . . . . . . . . 41
6. Security Considerations . . . . . . . . . . . . . . . . . . . 40 6. Security Considerations . . . . . . . . . . . . . . . . . . . 41
6.1. Support for Algorithms . . . . . . . . . . . . . . . . . 40 6.1. Support for Algorithms . . . . . . . . . . . . . . . . . 42
6.2. No Support for CRMF . . . . . . . . . . . . . . . . . . . 41 6.2. No Support for CRMF . . . . . . . . . . . . . . . . . . . 42
6.3. Access to Data Nodes . . . . . . . . . . . . . . . . . . 41 6.3. Access to Data Nodes . . . . . . . . . . . . . . . . . . 42
7. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 42 7. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 43
7.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 42 7.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 43
7.2. The YANG Module Names Registry . . . . . . . . . . . . . 43 7.2. The YANG Module Names Registry . . . . . . . . . . . . . 44
8. References . . . . . . . . . . . . . . . . . . . . . . . . . 43 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 44
8.1. Normative References . . . . . . . . . . . . . . . . . . 43 8.1. Normative References . . . . . . . . . . . . . . . . . . 45
8.2. Informative References . . . . . . . . . . . . . . . . . 46 8.2. Informative References . . . . . . . . . . . . . . . . . 47
Appendix A. Change Log . . . . . . . . . . . . . . . . . . . . . 49 Appendix A. Change Log . . . . . . . . . . . . . . . . . . . . . 50
A.1. I-D to 00 . . . . . . . . . . . . . . . . . . . . . . . . 49 A.1. I-D to 00 . . . . . . . . . . . . . . . . . . . . . . . . 50
A.2. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 49 A.2. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 50
A.3. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 49 A.3. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 50
A.4. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 49 A.4. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 50
A.5. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 50 A.5. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 51
A.6. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 50 A.6. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 51
A.7. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 50 A.7. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 51
A.8. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 51 A.8. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 52
A.9. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 51 A.9. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 52
A.10. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 51 A.10. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 52
A.11. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 51 A.11. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 52
A.12. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 52 A.12. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 53
A.13. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 52 A.13. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 53
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 52 A.14. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 53
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 52 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 54
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 54
1. Introduction 1. Introduction
This document defines four YANG 1.1 [RFC7950] modules for types This document defines four YANG 1.1 [RFC7950] modules for types
useful to cryptographic applications. The modules defined include: useful to cryptographic applications. The modules defined include:
o ietf-crypto-types o ietf-crypto-types
o iana-symmetric-algs o iana-symmetric-algs
skipping to change at page 6, line 17 skipping to change at page 6, line 17
This module has normative references to [RFC2404], [RFC3565], This module has normative references to [RFC2404], [RFC3565],
[RFC3686], [RFC4106], [RFC4253], [RFC4279], [RFC4309], [RFC4494], [RFC3686], [RFC4106], [RFC4253], [RFC4279], [RFC4309], [RFC4494],
[RFC4543], [RFC4868], [RFC5280], [RFC5652], [RFC5656], [RFC6187], [RFC4543], [RFC4868], [RFC5280], [RFC5652], [RFC5656], [RFC6187],
[RFC6991], [RFC7919], [RFC8268], [RFC8332], [RFC8341], [RFC8422], [RFC6991], [RFC7919], [RFC8268], [RFC8332], [RFC8341], [RFC8422],
[RFC8446], and [ITU.X690.2015]. [RFC8446], and [ITU.X690.2015].
This module has an informational reference to [RFC2986], [RFC3174], This module has an informational reference to [RFC2986], [RFC3174],
[RFC4493], [RFC5915], [RFC6125], [RFC6234], [RFC6239], [RFC6507], [RFC4493], [RFC5915], [RFC6125], [RFC6234], [RFC6239], [RFC6507],
[RFC8017], [RFC8032], [RFC8439]. [RFC8017], [RFC8032], [RFC8439].
<CODE BEGINS> file "ietf-crypto-types@2019-11-02.yang" <CODE BEGINS> file "ietf-crypto-types@2019-11-20.yang"
module ietf-crypto-types { module ietf-crypto-types {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-crypto-types"; namespace "urn:ietf:params:xml:ns:yang:ietf-crypto-types";
prefix ct; prefix ct;
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 7, line 29 skipping to change at page 7, line 29
Redistribution and use in source and binary forms, with Redistribution and use in source and binary forms, with
or without modification, is permitted pursuant to, and or without modification, is permitted pursuant to, and
subject to the license terms contained in, the Simplified subject to the license terms contained in, the Simplified
BSD License set forth in Section 4.c of the IETF Trust's BSD License set forth in Section 4.c of the IETF Trust's
Legal Provisions Relating to IETF Documents Legal Provisions Relating to IETF Documents
(https://trustee.ietf.org/license-info). (https://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC XXXX This version of this YANG module is part of RFC XXXX
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-11-02 { revision 2019-11-20 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: Common YANG Data Types for Cryptography"; "RFC XXXX: Common YANG Data Types for Cryptography";
} }
/****************/
/* Features */
/****************/
feature "one-asymmetric-key-format" {
description
"Indicates that the server supports the
'one-asymmetric-key-format' identity.";
}
feature "one-symmetric-key-format" {
description
"Indicates that the server supports the
'one-symmetric-key-format' identity.";
}
feature "encrypted-one-symmetric-key-format" {
description
"Indicates that the server supports the
'encrypted-one-symmetric-key-format' identity.";
}
feature "encrypted-one-asymmetric-key-format" {
description
"Indicates that the server supports the
'encrypted-one-asymmetric-key-format' identity.";
}
/********************************************/ /********************************************/
/* Identities for Key Format Structures */ /* Identities for Key Format Structures */
/********************************************/ /********************************************/
/*** all key format types ****/ /*** base key formats ****/
identity key-format-base { identity key-format-base {
description "Base key-format identity for all keys."; description "Base key-format identity for all keys.";
} }
identity public-key-format { identity public-key-format {
base "key-format-base"; base "key-format-base";
description "Base key-format identity for public keys."; description "Base key-format identity for public keys.";
} }
skipping to change at page 8, line 23 skipping to change at page 9, line 4
base "key-format-base"; base "key-format-base";
description "Base key-format identity for private keys."; description "Base key-format identity for private keys.";
} }
identity symmetric-key-format { identity symmetric-key-format {
base "key-format-base"; base "key-format-base";
description "Base key-format identity for symmetric keys."; description "Base key-format identity for symmetric keys.";
} }
/**** for private keys ****/ /**** for private keys ****/
identity rsa-private-key-format { identity rsa-private-key-format {
base "private-key-format"; base "private-key-format";
description "An RSAPrivateKey (from RFC 3447)."; description
"Indicates that the private key value is encoded
as an RSAPrivateKey (from RFC 3447).";
reference
"RFC 3447: PKCS #1: RSA Cryptography
Specifications Version 2.2";
} }
identity ec-private-key-format { identity ec-private-key-format {
base "private-key-format"; base "private-key-format";
description "An ECPrivateKey (from RFC 5915)"; description
"Indicates that the private key value is encoded
as an ECPrivateKey (from RFC 5915)";
reference
"RFC 5915: Elliptic Curve Private Key Structure";
} }
identity one-asymmetric-key-format { identity one-asymmetric-key-format {
base "private-key-format"; if-feature "one-asymmetric-key-format";
description "A OneAsymmetricKey (from RFC 5958)."; base "private-key-format";
description
"Indicates that the private key value is encoded
as a OneAsymmetricKey structure (RFC 6031).";
// FIXME: DER encoded ASN.1, etc...or flex PEM?
reference
"RFC 5958: Asymmetric Key Packages";
} }
identity encrypted-private-key-format { identity encrypted-one-asymmetric-key-format {
base "private-key-format"; if-feature "encrypted-one-asymmetric-key-format";
description base "private-key-format";
"A CMS EncryptedData structure (RFC 5652) description
containing a OneAsymmetricKey (RFC 5958)."; "Indicates that the private key value is encoded
as a OneAsymmetricKey structure (RFC 5958).";
// FIXME: DER encoded ASN.1, etc...or flex PEM?
reference
"RFC 5652: Cryptographic Message Syntax (CMS)
RFC 5958: Asymmetric Key Packages";
} }
/**** for public keys ****/ /**** for public keys ****/
identity ssh-public-key-format { identity ssh-public-key-format {
base "public-key-format"; base "public-key-format";
description description
"The public key format described by RFC 4716."; "Indicates that the public key value is encoded
an SSH public key, as described by RFC 4716.";
reference
"RFC 4716: The Secure Shell (SSH) Public Key
File Format";
} }
identity subject-public-key-info-format { identity subject-public-key-info-format {
base "public-key-format"; base "public-key-format";
description description
"A SubjectPublicKeyInfo (from RFC 5280)."; "Indicates that the public key value is encoded as
a SubjectPublicKeyInfo structure, as described in
RFC 5280.";
// FIXME: DER encoded ASN.1, etc...
reference
"RFC 5280:
Internet X.509 Public Key Infrastructure Certificate
and Certificate Revocation List (CRL) Profile";
} }
/**** for symmetric keys ****/ /**** for symmetric keys ****/
identity octet-string-key-format { identity octet-string-key-format {
base "symmetric-key-format"; base "symmetric-key-format";
description "An OctetString from ASN.1."; description
/* "Indicates that the key is encoded as a raw octet string.";
// Knowing that it is an "OctetString" isn't really helpful. // FIXME
// Knowing the length of the octet string would be helpful, // Knowing that it is an "OctetString" isn't really helpful.
// as it relates to the algorithm's block size. We may want // Knowing the length of the octet string would be helpful,
// to only (for now) use "one-symmetric-key-format" for // as it relates to the algorithm's block size. We may want
// symmetric keys...were the usability issues Juergen // to only (for now) use "one-symmetric-key-format" for
// mentioned before only apply to asymmetric keys? // symmetric keys...were the usability issues Juergen
*/ // mentioned before only apply to asymmetric keys?
} }
identity one-symmetric-key-format { identity one-symmetric-key-format {
base "symmetric-key-format"; if-feature "one-symmetric-key-format";
description "A OneSymmetricKey (from RFC6031)."; base "symmetric-key-format";
description
"Indicates that the symmetric key value is encoded
as a OneSymmetricKey (from RFC 6031).";
// FIXME: DER encoded ASN.1, etc...or flex PEM?
reference
"RFC 6031: Cryptographic Message Syntax (CMS)
Symmetric Key Package Content Type";
} }
identity encrypted-one-symmetric-key-format {
identity encrypted-symmetric-key-format { if-feature "encrypted-one-symmetric-key-format";
base "symmetric-key-format"; base "symmetric-key-format";
description description
"A CMS EncryptedData structure (RFC 5652) "Indicates that the symmetric key value is encoded
containing a OneSymmetricKey (RFC 6031)."; as an EncryptedData structure (RFC 5652) containing
OneSymmetricKey (RFC 6031).";
// FIXME: DER encoded ASN.1, etc...or flex PEM?
reference
"RFC 5652: Cryptographic Message Syntax (CMS)
RFC 6031: Cryptographic Message Syntax (CMS)
Symmetric Key Package Content Type";
} }
/***************************************************/ /***************************************************/
/* Typedefs for ASN.1 structures from RFC 5280 */ /* Typedefs for ASN.1 structures from RFC 5280 */
/***************************************************/ /***************************************************/
typedef x509 { typedef x509 {
type binary; type binary;
description description
"A Certificate structure, as specified in RFC 5280, "A Certificate structure, as specified in RFC 5280,
skipping to change at page 12, line 18 skipping to change at page 13, line 42
type cms; type cms;
description description
"A CMS structure whose top-most content type MUST be the "A CMS structure whose top-most content type MUST be the
authenticated-data content type, as described by Section 9 authenticated-data content type, as described by Section 9
in RFC 5652."; in RFC 5652.";
reference reference
"RFC 5652: Cryptographic Message Syntax (CMS)"; "RFC 5652: Cryptographic Message Syntax (CMS)";
} }
/***************************************************/ /***************************************************/
/* Typedefs for structures related to !!FIXME!! */
/***************************************************/
typedef psk {
type binary;
description
"The binary key data for a PSK (pairwise-symmetric or
pre-shared key). FIXME: specify how it is formmated.";
}
typedef raw-public-key {
type binary;
description
"The binary key data for a raw public key.
FIXME: specify how it is formmated.";
}
/***************************************************/
/* Typedefs for structures related to RFC 4253 */ /* Typedefs for structures related to RFC 4253 */
/***************************************************/ /***************************************************/
typedef ssh-host-key { typedef ssh-host-key {
type binary; type binary;
description description
"The binary public key data for an SSH key, as "The binary public key data for an SSH key, as
specified by RFC 4253, Section 6.6, i.e.: specified by RFC 4253, Section 6.6, i.e.:
string certificate or public key format string certificate or public key format
skipping to change at page 15, line 17 skipping to change at page 16, line 27
leaf algorithm { leaf algorithm {
type isa:symmetric-algorithm-type; type isa:symmetric-algorithm-type;
mandatory true; mandatory true;
description description
"The algorithm to be used when generating the key."; "The algorithm to be used when generating the key.";
reference reference
"RFC CCCC: Common YANG Data Types for Cryptography"; "RFC CCCC: Common YANG Data Types for Cryptography";
} }
leaf key-format { leaf key-format {
nacm:default-deny-write; nacm:default-deny-write;
when "../key"; when "../key or ../encrypted-key"; // FIXME: forward ref?!
type identityref { type identityref {
base symmetric-key-format; base symmetric-key-format;
} }
description "Identifies the symmetric key's format."; description "Identifies the symmetric key's format.";
} }
choice key-type { choice key-type {
mandatory true; mandatory true;
description description
"Choice between key types."; "Choice between key types.";
leaf key { leaf key {
nacm:default-deny-all; nacm:default-deny-all;
type binary; type binary;
//must "../key-format"; FIXME: remove comment if approach ok must "../key-format";
description description
"The binary value of the key. The interpretation of "The binary value of the key. The interpretation of
the value is defined by 'key-format'. For example, the value is defined by 'key-format'. For example,
FIXME."; FIXME.";
reference reference
"RFC XXXX: FIXME"; "RFC XXXX: FIXME";
} }
leaf hidden-key { leaf hidden-key {
nacm:default-deny-write; nacm:default-deny-write;
type empty; type empty;
skipping to change at page 16, line 23 skipping to change at page 17, line 32
nacm:default-deny-write; nacm:default-deny-write;
when "../public-key"; when "../public-key";
type identityref { type identityref {
base public-key-format; base public-key-format;
} }
description "Identifies the key's format."; description "Identifies the key's format.";
} }
leaf public-key { leaf public-key {
nacm:default-deny-write; nacm:default-deny-write;
type binary; type binary;
//must "../public-key-format"; FIXME: rm comment if approach ok must "../public-key-format";
mandatory true; mandatory true;
description description
"The binary value of the public key. The interpretation "The binary value of the public key. The interpretation
of the value is defined by 'public-key-format' field."; of the value is defined by 'public-key-format' field.";
} }
} }
grouping asymmetric-key-pair-grouping { grouping asymmetric-key-pair-grouping {
description description
"A private key and its associated public key and algorithm."; "A private key and its associated public key and algorithm.";
uses public-key-grouping; uses public-key-grouping;
leaf private-key-format { leaf private-key-format {
nacm:default-deny-write; nacm:default-deny-write;
when "../private-key"; when "../private-key or ../encrypted-private-key";
// FIXME: forward ref?!
type identityref { type identityref {
base private-key-format; base private-key-format;
} }
description "Identifies the key's format."; description "Identifies the key's format.";
} }
choice private-key-type { choice private-key-type {
mandatory true; mandatory true;
description description
"Choice between key types."; "Choice between key types.";
leaf private-key { leaf private-key {
nacm:default-deny-all; nacm:default-deny-all;
type binary; type binary;
//must "../private-key-format"; FIXME: rm comment if ok must "../private-key-format";
description description
"The value of the binary key. The key's value is "The value of the binary key The key's value is
interpreted by the 'private-key-format' field."; interpreted by the 'private-key-format' field.";
} }
leaf hidden-private-key { leaf hidden-private-key {
nacm:default-deny-write; nacm:default-deny-write;
type empty; type empty;
description description
"A permanently hidden key. How such keys are created "A permanently hidden key. How such keys are created
is outside the scope of this module."; is outside the scope of this module.";
} }
} }
skipping to change at page 20, line 28 skipping to change at page 21, line 39
"RFC 2986: "RFC 2986:
PKCS #10: Certification Request Syntax PKCS #10: Certification Request Syntax
Specification Version 1.7. Specification Version 1.7.
ITU-T X.690: ITU-T X.690:
Information technology - ASN.1 encoding rules: Information technology - ASN.1 encoding rules:
Specification of Basic Encoding Rules (BER), Specification of Basic Encoding Rules (BER),
Canonical Encoding Rules (CER) and Distinguished Canonical Encoding Rules (CER) and Distinguished
Encoding Rules (DER)."; Encoding Rules (DER).";
} }
leaf attributes { leaf attributes {
type binary; // FIXME: does this need to be mandatory? type binary;
description description
"The 'attributes' field from the structure "The 'attributes' field from the structure
CertificationRequestInfo as specified by RFC 2986, CertificationRequestInfo as specified by RFC 2986,
Section 4.1 encoded using the ASN.1 distinguished Section 4.1 encoded using the ASN.1 distinguished
encoding rules (DER), as specified in ITU-T X.690."; encoding rules (DER), as specified in ITU-T X.690.";
reference reference
"RFC 2986: "RFC 2986:
PKCS #10: Certification Request Syntax PKCS #10: Certification Request Syntax
Specification Version 1.7. Specification Version 1.7.
ITU-T X.690: ITU-T X.690:
skipping to change at page 22, line 30 skipping to change at page 23, line 40
"RFC 2986: "RFC 2986:
PKCS #10: Certification Request Syntax PKCS #10: Certification Request Syntax
Specification Version 1.7. Specification Version 1.7.
ITU-T X.690: ITU-T X.690:
Information technology - ASN.1 encoding rules: Information technology - ASN.1 encoding rules:
Specification of Basic Encoding Rules (BER), Specification of Basic Encoding Rules (BER),
Canonical Encoding Rules (CER) and Distinguished Canonical Encoding Rules (CER) and Distinguished
Encoding Rules (DER)."; Encoding Rules (DER).";
} }
leaf attributes { leaf attributes {
type binary; // FIXME: does this need to be mandatory? type binary;
description description
"The 'attributes' field from the structure "The 'attributes' field from the structure
CertificationRequestInfo as specified by RFC 2986, CertificationRequestInfo as specified by RFC 2986,
Section 4.1 encoded using the ASN.1 distinguished Section 4.1 encoded using the ASN.1 distinguished
encoding rules (DER), as specified in ITU-T X.690."; encoding rules (DER), as specified in ITU-T X.690.";
reference reference
"RFC 2986: "RFC 2986:
PKCS #10: Certification Request Syntax PKCS #10: Certification Request Syntax
Specification Version 1.7. Specification Version 1.7.
ITU-T X.690: ITU-T X.690:
skipping to change at page 27, line 43 skipping to change at page 28, line 48
module: iana-symmetric-algs module: iana-symmetric-algs
+--ro supported-symmetric-algorithms +--ro supported-symmetric-algorithms
+--ro supported-symmetric-algorithm* [algorithm] +--ro supported-symmetric-algorithm* [algorithm]
+--ro algorithm symmetric-algorithm-type +--ro algorithm symmetric-algorithm-type
3.2. YANG Module 3.2. YANG Module
This module has normative references to FIXME... This module has normative references to FIXME...
<CODE BEGINS> file "iana-symmetric-algs@2019-11-02.yang" <CODE BEGINS> file "iana-symmetric-algs@2019-11-20.yang"
module iana-symmetric-algs { module iana-symmetric-algs {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:iana-symmetric-algs"; namespace "urn:ietf:params:xml:ns:yang:iana-symmetric-algs";
prefix isa; prefix isa;
organization organization
"IETF NETCONF (Network Configuration) Working Group"; "IETF NETCONF (Network Configuration) Working Group";
contact contact
skipping to change at page 28, line 27 skipping to change at page 29, line 31
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 XXXX
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-11-02 { revision 2019-11-20 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: Common YANG Data Types for Cryptography"; "RFC XXXX: Common YANG Data Types for Cryptography";
} }
// Typedefs // Typedefs
typedef symmetric-algorithm-type { typedef symmetric-algorithm-type {
type enumeration { type enumeration {
skipping to change at page 32, line 9 skipping to change at page 33, line 14
module: iana-asymmetric-algs module: iana-asymmetric-algs
+--ro supported-asymmetric-algorithms +--ro supported-asymmetric-algorithms
+--ro supported-asymmetric-algorithm* [algorithm] +--ro supported-asymmetric-algorithm* [algorithm]
+--ro algorithm asymmetric-algorithm-type +--ro algorithm asymmetric-algorithm-type
4.2. YANG Module 4.2. YANG Module
This module has normative references to FIXME... This module has normative references to FIXME...
<CODE BEGINS> file "iana-asymmetric-algs@2019-11-02.yang" <CODE BEGINS> file "iana-asymmetric-algs@2019-11-20.yang"
module iana-asymmetric-algs { module iana-asymmetric-algs {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:iana-asymmetric-algs"; namespace "urn:ietf:params:xml:ns:yang:iana-asymmetric-algs";
prefix iasa; prefix iasa;
organization organization
"IETF NETCONF (Network Configuration) Working Group"; "IETF NETCONF (Network Configuration) Working Group";
contact contact
skipping to change at page 32, line 41 skipping to change at page 33, line 46
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 XXXX
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-11-02 { revision 2019-11-20 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: Common YANG Data Types for Cryptography"; "RFC XXXX: Common YANG Data Types for Cryptography";
} }
// Typedefs // Typedefs
typedef asymmetric-algorithm-type { typedef asymmetric-algorithm-type {
type enumeration { type enumeration {
enum rsa1024 { enum rsa1024 {
value 1; value 1;
skipping to change at page 36, line 49 skipping to change at page 38, line 9
module: iana-hash-algs module: iana-hash-algs
+--ro supported-hash-algorithms +--ro supported-hash-algorithms
+--ro supported-hash-algorithm* [algorithm] +--ro supported-hash-algorithm* [algorithm]
+--ro algorithm hash-algorithm-type +--ro algorithm hash-algorithm-type
5.2. YANG Module 5.2. YANG Module
This module has normative references to FIXME... This module has normative references to FIXME...
<CODE BEGINS> file "iana-hash-algs@2019-11-02.yang" <CODE BEGINS> file "iana-hash-algs@2019-11-20.yang"
module iana-hash-algs { module iana-hash-algs {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:iana-hash-algs"; namespace "urn:ietf:params:xml:ns:yang:iana-hash-algs";
prefix iha; prefix iha;
organization organization
"IETF NETCONF (Network Configuration) Working Group"; "IETF NETCONF (Network Configuration) Working Group";
contact contact
skipping to change at page 37, line 32 skipping to change at page 38, line 41
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 XXXX
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-11-02 { revision 2019-11-20 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: Common YANG Data Types for Cryptography"; "RFC XXXX: Common YANG Data Types for Cryptography";
} }
// Typedefs // Typedefs
typedef hash-algorithm-type { typedef hash-algorithm-type {
type enumeration { type enumeration {
enum sha1 { enum sha1 {
value 1; value 1;
skipping to change at page 52, line 37 skipping to change at page 53, line 37
A.13. 11 to 12 A.13. 11 to 12
o Removed all non-essential (to NC/RC) algorithm types. o Removed all non-essential (to NC/RC) algorithm types.
o Moved remaining algorithm types each into its own module. o Moved remaining algorithm types each into its own module.
o Added a 'config false' "algorithms-supported" list to each of the o Added a 'config false' "algorithms-supported" list to each of the
algorithm-type modules. algorithm-type modules.
A.14. 12 to 13
o Added the four features: "[encrypted-]one-[a]symmetric-key-
format", each protecting a 'key-format' identity of the same name.
o Added 'must' expressions asserting that the 'key-format' leaf
exists whenever a non-hidden key is specified.
o Improved the 'description' statements and added 'reference'
statements for the 'key-format' identities.
o Added a questionable forward reference to "encrypted-*" leafs in a
couple 'when' expressions.
o Did NOT move "config false" alg-supported lists to SSH/TLS drafts.
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): Martin Bjorklund, on list and in the halls (ordered by last name): Martin Bjorklund,
Nick Hancock, Balazs Kovacs, Juergen Schoenwaelder, Eric Voit, and Nick Hancock, Balazs Kovacs, Juergen Schoenwaelder, Eric Voit, and
Liang Xia. Liang Xia.
Authors' Addresses Authors' Addresses
Kent Watsen Kent Watsen
 End of changes. 42 change blocks. 
120 lines changed or deleted 192 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/