From f630482b4e54b53b78434c6bfc11591ddfdcfbe7 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 11 May 2015 16:27:20 +0200 Subject: public_key: Align "=" sign in type declarations to decided policy --- lib/public_key/doc/src/public_key.xml | 157 +++++++++++++------------- lib/public_key/doc/src/public_key_records.xml | 32 +++--- 2 files changed, 97 insertions(+), 92 deletions(-) (limited to 'lib/public_key') diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 6d220c9b69..883c52393f 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -87,104 +87,109 @@ oid()

Object identifier, a tuple of integers as generated by the ASN.1 compiler.

 - boolean() -

= true | false

 - - string() -

= [bytes()]

 - - der_encoded() -

= binary()

 - - pki_asn1_type() - =

'Certificate'

-

| 'RSAPrivateKey'

-

| 'RSAPublicKey'

-

| 'DSAPrivateKey'

-

| 'DSAPublicKey'

-

| 'DHParameter'

-

| 'SubjectPublicKeyInfo'

-

| 'PrivateKeyInfo'

-

| 'CertificationRequest'

-

| 'ECPrivateKey'

-

| 'EcpkParameters'

 - - pem_entry () -

= {pki_asn1_type(), binary(), %% DER or encrypted DER not_encrypted

-

| cipher_info()}

 + boolean() = +

true | false

 + + string() = +

[bytes()]

 + + der_encoded() = +

binary()

 + + pki_asn1_type() = + +

'Certificate'

+

| 'RSAPrivateKey'

+

| 'RSAPublicKey'

+

| 'DSAPrivateKey'

+

| 'DSAPublicKey'

+

| 'DHParameter'

+

| 'SubjectPublicKeyInfo'

+

| 'PrivateKeyInfo'

+

| 'CertificationRequest'

+

| 'ECPrivateKey'

+

| 'EcpkParameters'

+ - cipher_info() -

= {"RC2-CBC" | "DES-CBC" | "DES-EDE3-CBC", crypto:rand_bytes(8)

+ pem_entry () = +

{pki_asn1_type(), binary(), %% DER or encrypted DER not_encrypted

+

| cipher_info()}

 + + cipher_info() = +

{"RC2-CBC" | "DES-CBC" | "DES-EDE3-CBC", crypto:rand_bytes(8)

| {#'PBEParameter{}, digest_type()} | #'PBES2-params'{}}

 - public_key() -

= rsa_public_key() | dsa_public_key() | ec_public_key()

 - - private_key() -

= rsa_private_key() | dsa_private_key() | ec_private_key()

 + public_key() = +

rsa_public_key() | dsa_public_key() | ec_public_key()

 + + private_key() = +

rsa_private_key() | dsa_private_key() | ec_private_key()

 - rsa_public_key() -

= #'RSAPublicKey'{}

 + rsa_public_key() = +

#'RSAPublicKey'{}

 - rsa_private_key() -

= #'RSAPrivateKey'{}

 + rsa_private_key() = +

#'RSAPrivateKey'{}

 - dsa_public_key() -

= {integer(), #'Dss-Parms'{}}

 + dsa_public_key() = +

{integer(), #'Dss-Parms'{}}

 - dsa_private_key() -

= #'DSAPrivateKey'{}

 + dsa_private_key() = +

#'DSAPrivateKey'{}

 ec_public_key()

= {#'ECPoint'{}, #'EcpkParameters'{} | {namedCurve, oid()}}

 - ec_private_key() -

= #'ECPrivateKey'{}

 + ec_private_key() = +

#'ECPrivateKey'{}

 - public_crypt_options() -

= [{rsa_pad, rsa_padding()}]

 + public_crypt_options() = +

[{rsa_pad, rsa_padding()}]

 - rsa_padding() -

= 'rsa_pkcs1_padding'

-

| 'rsa_pkcs1_oaep_padding'

-

| 'rsa_no_padding'

+ rsa_padding() = + +

'rsa_pkcs1_padding'

+

| 'rsa_pkcs1_oaep_padding'

+

| 'rsa_no_padding'

 - digest_type() + digest_type() =

Union of rsa_digest_type(), dss_digest_type(), and ecdsa_digest_type().

 - rsa_digest_type() -

= 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512'

 - - dss_digest_type() -

= 'sha'

 - - ecdsa_digest_type() -

= 'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512'

 - - crl_reason() -

= unspecified

-

| keyCompromise

-

| cACompromise

-

| affiliationChanged

-

| superseded

-

| cessationOfOperation

-

| certificateHold

-

| privilegeWithdrawn

-

| aACompromise

- + rsa_digest_type() = +

'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512'

 + + dss_digest_type() = +

'sha'

 - issuer_name() -

= {rdnSequence,[#'AttributeTypeAndValue'{}]}

+ ecdsa_digest_type() = +

'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512'

 + + crl_reason() = + +

unspecified

+

| keyCompromise

+

| cACompromise

+

| affiliationChanged

+

| superseded

+

| cessationOfOperation

+

| certificateHold

+

| privilegeWithdrawn

+

| aACompromise

 - ssh_file() -

= openssh_public_key

-

| rfc4716_public_key

-

| known_hosts

-

| auth_keys

+ issuer_name() = +

{rdnSequence,[#'AttributeTypeAndValue'{}]}

+ + + ssh_file() = + +

openssh_public_key

+

| rfc4716_public_key

+

| known_hosts

+

| auth_keys

 diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml index 9536167839..fc2a74a353 100644 --- a/lib/public_key/doc/src/public_key_records.xml +++ b/lib/public_key/doc/src/public_key_records.xml @@ -55,17 +55,17 @@ follows here:

- time() -

= uct_time() | general_time()

 + time() = +

uct_time() | general_time()

 - uct_time() -

= {utcTime, "YYMMDDHHMMSSZ"}

 + uct_time() = +

{utcTime, "YYMMDDHHMMSSZ"}

 - general_time() -

= {generalTime, "YYYYMMDDHHMMSSZ"}

 + general_time() = +

{generalTime, "YYYYMMDDHHMMSSZ"}

 - general_name() - =

{rfc822Name, string()}

+ general_name() = +

{rfc822Name, string()}

| {dNSName, string()}

| {x400Address, string()}

| {directoryName, {rdnSequence, [#AttributeTypeAndValue'{}]}}

@@ -77,16 +77,16 @@

| {otherName, term()}

 - special_string() - =

{teletexString, string()}

+ special_string() = +

{teletexString, string()}

| {printableString, string()}

| {universalString, string()}

| {utf8String, binary()}

| {bmpString, string()}

 - dist_reason() - =

unused

+ dist_reason() = +

unused

| keyCompromise

| cACompromise

| affiliationChanged

@@ -97,12 +97,12 @@

| aACompromise

 - OID_macro() - =

?OID_name()

+ OID_macro() = +

?OID_name()

 - OID_name() - =

atom()

+ OID_name() = +

atom()

 -- cgit v1.2.3