summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--KEP-0017.txt26
1 files changed, 16 insertions, 10 deletions
diff --git a/KEP-0017.txt b/KEP-0017.txt
index d805dac..7c92d9a 100644
--- a/KEP-0017.txt
+++ b/KEP-0017.txt
@@ -1338,16 +1338,23 @@ The global position '''SHOULD''' be interpreted as a location which is related t
Implements:
* {{rfc|6350}} [https://tools.ietf.org/html/rfc6350#section-6.5.2 section-6.5.2]
-===== Crypto =====
+===== Cryptographic Key =====
+
+ property-key = element key {
+ element uri { [[#URI inline encoding]] }
+ }
+
+''Specifies a public key or authentication certificate associated with the contact. ''
+
+This key ''MAY'' be used to encrypt or sign using OpenPGP or S/MIME. The embedded key '''MUST''' have the type "application/pgp-keys" or "application/pkcs7-mime".
+
+Implements:
+* {{rfc|6350}} [https://tools.ietf.org/html/rfc6350#section-6.8.1 section-6.8.1]
+
+===== Cryptographic Preferences =====
property-crypto = element x-crypto {
element allowed { element text { "PGP/INLINE" | "PGP/MIME" | "S/MIME" | "S/MIMEOpaque" }* },
- element pgpkey {
- element uri { [[#URI inline encoding]] }
- } ?,
- element smimekey {
- element uri { [[#URI inline encoding]] }
- } ?,
element signpref { element text { "Never" | "Always" | "IfPossible" | "Ask" } } ?,
element encryptpref { element text { "Never" | "Always" | "IfPossible" | "Ask" } } ?
}
@@ -1359,8 +1366,6 @@ Implements:
:* "PGP/MIME": Allows PGP/MIME for encrypted and signed content.
:* "S/MIME": Allows clear signed messages using S/MIME.
:* "S/MIMEOpaque": Allows opaque signed messages using S/MIME.
-* "pgpkey": Specifies a public key or authentication certificate associated with the contact. This key ''MAY'' be used to encrypt or sign using OpenPGP. The embedded key '''MUST''' have the type "application/pgp-keys".
-* "smimekey": Specifies a public key or authentication certificate associated with the contact. This key ''MAY'' be used to encrypt or sign using S/MIME. The embedded key '''MUST''' have the type "application/pkcs7-mime".
* "signpref": This preference '''SHOULD''' be considered when sending content to the contact. If not specified this preference '''SHALL''' default to "Ask"
:* "Never": Never sign something before sending.
:* "Always": Alway sign, abort if signing is not possible.
@@ -1433,7 +1438,8 @@ Implements:
element impp { [[#IM Address]] } *,
element email { [[#EMail]] } *,
element geo { [[#Global Positioning]] } *,
- element x-crypto { [[#Crypto]] } ?,
+ element key { [[#Cryptographic Key]] } *,
+ element x-crypto { [[#Cryptographic Preferences]] } ?,
element x-custom { [[#Kolab Custom Property]] } *
}