From dc606eac7d452827b67a0c054fc518aba95dbbab Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Fri, 6 Jun 2014 15:54:22 -0700
Subject: [PATCH] Some tweaks to the config format

---
 README.md   | 21 +++++++++++----------
 config.json | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 0cc4f5f05..31495a8f5 100644
--- a/README.md
+++ b/README.md
@@ -49,22 +49,23 @@ The basic file format will be JSON with comments (http://blog.getify.com/json-co
 
     {
       // Canonical URL https://eff.org/starttls-everywhere/config -- redirects to latest version
-      "timestamp": 1401093333
+      "timestamp": "2014-06-06T14:30:16+00:00",
+      // "timestamp": 1401414363,  : also acceptable
       "author": "Electronic Frontier Foundation https://eff.org",
-      "expires": 1401414363, // epoch seconds
-      "address-domains": {
+      "expires": "2014-06-06T14:30:16+00:00",
+      "acceptable-mxs": {
         "gmail.com": {
-          "accept-mx-domains": ["google.com", "gmail.com"]
+          "accept-mx-domains": ["*.google.com", "*.gmail.com"]
         }
         "yahoo.com": {
-          "accept-mx-domains": ["yahoodns.net"]
+          "accept-mx-domains": ["*.yahoodns.net"]
         }
         "eff.org": {
-          "accept-mx-domains": ["eff.org"]
+          "accept-mx-domains": ["*.eff.org"]
         }
       }
-      "mx-domains": {
-        "eff.org": {
+      "security-policies": {
+        "*.eff.org": {
           "require-tls": true,
           "min-tls-version": "TLSv1.1",
           "enforce-mode": "enforce"
@@ -73,13 +74,13 @@ The basic file format will be JSON with comments (http://blog.getify.com/json-co
             "sha1/YlrkMlC6C4SJRZSVyRvnvoJ+8eM="
           ]
         }
-        "google.com": {
+        "*.google.com": {
           "require-valid-certificate": true,
           "min-tls-version": "TLSv1.1",
           "enforce-mode": "log-only",
           "error-notification": "https://google.com/post/reports/here"
         },
-        "yahoodns.net": {
+        "*.yahoodns.net": {
            "require-valid-certificate": true,
          }
       }
diff --git a/config.json b/config.json
index d660587f1..8d6a73d63 100644
--- a/config.json
+++ b/config.json
@@ -1,17 +1,17 @@
 {
-  // Canonical URL https://eff.org/starttls-everywhere/config -- redirects to
-  // latest version
-  "timestamp": 1401093333
+  "comment": "Canonical URL https://eff.org/starttls-everywhere/config -- redirects to latest version",
+  "timestamp": 1401093333,
   "author": "Electronic Frontier Foundation https://eff.org",
-  "expires": 1404677353, // epoch seconds
-  "address-domains": {
-    "valid-example-recipient.com": {
-      "accept-mx-domains": [ "valid-example-recipient.com" ]
-    }
-  }
-  "mx-domains": {
-    "valid-example-recipient.com": {
+  "expires": 1404677353, "comment 2:": "epoch seconds",
+  "tls-policies": {
+    "*.valid-example-recipient.com": {
       "min-tls-version": "TLSv1.1"
     }
   }
+  "acceptable-mxs": {
+    "valid-example-recipient.com": {
+      "accept-mx-domains": [ "*.valid-example-recipient.com" ]
+    }
+  },
+
 }