Skip to content

Commit

Permalink
Merge pull request #1156 from mayocream/master
Browse files Browse the repository at this point in the history
format json indent
  • Loading branch information
nickysemenza authored Dec 11, 2020
2 parents a538700 + d103ea1 commit c75db4f
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 172 deletions.
28 changes: 15 additions & 13 deletions transport/example/ca.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"hosts": [
"dropsonde.net"
],
"key": {
"algo": "rsa",
"size": 4096
},
"names": [{
"C": "US",
"L": "San Francisco",
"OU": "Dropsonde Certificate Authority",
"ST": "California"
}]
"hosts": [
"dropsonde.net"
],
"key": {
"algo": "rsa",
"size": 4096
},
"names": [
{
"C": "US",
"L": "San Francisco",
"OU": "Dropsonde Certificate Authority",
"ST": "California"
}
]
}
44 changes: 22 additions & 22 deletions transport/example/config.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"signing": {
"default": {
"expiry": "168h"
},
"profiles": {
"client": {
"expiry": "1h",
"usages": [
"signing",
"key encipherment",
"client auth"
]
},
"server": {
"expiry": "1h",
"usages": [
"signing",
"key encipherment",
"server auth"
]
}
}
"signing": {
"default": {
"expiry": "168h"
},
"profiles": {
"client": {
"expiry": "1h",
"usages": [
"signing",
"key encipherment",
"client auth"
]
},
"server": {
"expiry": "1h",
"usages": [
"signing",
"key encipherment",
"server auth"
]
}
}
}
}
66 changes: 33 additions & 33 deletions transport/example/config_auth.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"auth_keys": {
"client": {
"type": "standard",
"key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
},
"server": {
"type": "standard",
"key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
}
"auth_keys": {
"client": {
"type": "standard",
"key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
},
"signing": {
"default": {
"expiry": "168h"
},
"profiles": {
"client": {
"auth_key": "client",
"expiry": "1h",
"usages": [
"signing",
"key encipherment",
"client auth"
]
},
"server": {
"auth_key": "server",
"expiry": "8760h",
"usages": [
"signing",
"key encipherment",
"server auth"
]
}
}
"server": {
"type": "standard",
"key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
}
},
"signing": {
"default": {
"expiry": "168h"
},
"profiles": {
"client": {
"auth_key": "client",
"expiry": "1h",
"usages": [
"signing",
"key encipherment",
"client auth"
]
},
"server": {
"auth_key": "server",
"expiry": "8760h",
"usages": [
"signing",
"key encipherment",
"server auth"
]
}
}
}
}
48 changes: 24 additions & 24 deletions transport/example/maclient/client.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"request": {
"CN": "test client",
"hosts": ["127.0.0.1"]
"request": {
"CN": "test client",
"hosts": ["127.0.0.1"]
},
"profiles": {
"paths": {
"private_key": "client.key",
"certificate": "client.pem"
},
"profiles": {
"paths": {
"private_key": "client.key",
"certificate": "client.pem"
},
"cfssl": {
"profile": "client",
"remote": "127.0.0.1:8888"
}
"cfssl": {
"profile": "client",
"remote": "127.0.0.1:8888"
}
},
"roots": [
{
"type": "system"
},
"roots": [
{
"type": "system"
},
{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "server"
}
}
]
{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "server"
}
}
]
}
52 changes: 26 additions & 26 deletions transport/example/maclient/client_auth.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"request": {
"CN": "test client",
"hosts": ["127.0.0.1"]
"request": {
"CN": "test client",
"hosts": ["127.0.0.1"]
},
"profiles": {
"paths": {
"private_key": "client.key",
"certificate": "client.pem"
},
"profiles": {
"paths": {
"private_key": "client.key",
"certificate": "client.pem"
},
"cfssl": {
"profile": "client",
"remote": "127.0.0.1:8888",
"auth-type": "standard",
"auth-key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
}
"cfssl": {
"profile": "client",
"remote": "127.0.0.1:8888",
"auth-type": "standard",
"auth-key": "52abb3ac91971bb72bce17e7a289cd04476490b19e0d8eb7810dc42d4ac16c41"
}
},
"roots": [
{
"type": "system"
},
"roots": [
{
"type": "system"
},
{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "server"
}
}
]
{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "server"
}
}
]
}
58 changes: 29 additions & 29 deletions transport/example/maserver/server.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"request": {
"CN": "test server",
"hosts": [
"127.0.0.1"
]
},
"profiles": {
"paths": {
"private_key": "server.key",
"certificate": "server.pem"
},
"cfssl": {
"profile": "server",
"remote": "127.0.0.1:8888"
}
},
"roots": [
{
"type": "system"
}
],
"client_roots": [
{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "maclient"
}
}
"request": {
"CN": "test server",
"hosts": [
"127.0.0.1"
]
},
"profiles": {
"paths": {
"private_key": "server.key",
"certificate": "server.pem"
},
"cfssl": {
"profile": "server",
"remote": "127.0.0.1:8888"
}
},
"roots": [
{
"type": "system"
}
],
"client_roots": [
{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "maclient"
}
}
]
}
50 changes: 25 additions & 25 deletions transport/example/maserver/server_auth.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"request": {
"CN": "test server",
"hosts": ["127.0.0.1"]
"request": {
"CN": "test server",
"hosts": ["127.0.0.1"]
},
"profiles": {
"paths": {
"private_key": "server.key",
"certificate": "server.pem"
},
"profiles": {
"paths": {
"private_key": "server.key",
"certificate": "server.pem"
},
"cfssl": {
"profile": "server",
"remote": "127.0.0.1:8888",
"auth-type": "standard",
"auth-key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
}
},
"roots": [{
"type": "system"
}],
"client_roots": [{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "client"
}
}]
"cfssl": {
"profile": "server",
"remote": "127.0.0.1:8888",
"auth-type": "standard",
"auth-key": "4f4f26686209f672e0ec7b19cbbc8b6d94fdd12cc0b20326f9005d5f234e6e3e"
}
},
"roots": [{
"type": "system"
}],
"client_roots": [{
"type": "cfssl",
"metadata": {
"host": "127.0.0.1:8888",
"profile": "client"
}
}]
}

0 comments on commit c75db4f

Please sign in to comment.