diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-24 14:24:53 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-24 14:24:53 +0100 |
| commit | 6c41d496a264e33b469c73f92253d0e158a496eb (patch) | |
| tree | a2c0c940737f448a1d9baa03f8d6ee7c8712de84 | |
| parent | b97004e26e179b6a75ddd99fe2b817ce12badfe9 (diff) | |
| parent | 0aba6244bcd6d0b56be65229719fbd85a20e74b6 (diff) | |
| download | prosody-6c41d496a264e33b469c73f92253d0e158a496eb.tar.gz prosody-6c41d496a264e33b469c73f92253d0e158a496eb.zip | |
Merge 0.10->trunk
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | certs/localhost.cnf | 24 | ||||
| -rw-r--r-- | certs/localhost.crt | 22 | ||||
| -rw-r--r-- | certs/localhost.key | 15 |
4 files changed, 25 insertions, 37 deletions
@@ -17,6 +17,7 @@ INSTALLEDDATA = $(DATADIR) all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version $(MAKE) -C util-src install + $(MAKE) -C certs localhost.crt example.com.crt install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) diff --git a/certs/localhost.cnf b/certs/localhost.cnf new file mode 100644 index 00000000..41548534 --- /dev/null +++ b/certs/localhost.cnf @@ -0,0 +1,24 @@ +[v3_extensions] +extendedKeyUsage = serverAuth,clientAuth +keyUsage = digitalSignature,keyEncipherment +basicConstraints = CA:FALSE +subjectAltName = @subject_alternative_name + +[subject_alternative_name] +DNS.0 = localhost +otherName.0 = 1.3.6.1.5.5.7.8.7;IA5STRING:_xmpp-client.localhost +otherName.1 = 1.3.6.1.5.5.7.8.7;IA5STRING:_xmpp-server.localhost +otherName.2 = 1.3.6.1.5.5.7.8.5;FORMAT:UTF8,UTF8:localhost + +[distinguished_name] +countryName = GB +organizationName = Prosody IM +organizationalUnitName = http://prosody.im/doc/certificates +commonName = Example certificate + +[req] +prompt = no +x509_extensions = v3_extensions +req_extensions = v3_extensions +distinguished_name = distinguished_name + diff --git a/certs/localhost.crt b/certs/localhost.crt deleted file mode 100644 index 5156d307..00000000 --- a/certs/localhost.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDojCCAwugAwIBAgIJAPO1OI+vmUi8MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD -VQQGEwJHQjETMBEGA1UECBMKSmFiYmVybGFuZDETMBEGA1UEChMKUHJvc29keSBJ -TTE8MDoGA1UECxQzaHR0cDovL3Byb3NvZHkuaW0vZG9jL2FkdmFuY2VkX3NzbF90 -bHMjY2VydGlmaWNhdGVzMRwwGgYDVQQDExNFeGFtcGxlIGNlcnRpZmljYXRlMB4X -DTA5MTAxNzE3MDc1NloXDTEwMTAxNzE3MDc1NlowgZMxCzAJBgNVBAYTAkdCMRMw -EQYDVQQIEwpKYWJiZXJsYW5kMRMwEQYDVQQKEwpQcm9zb2R5IElNMTwwOgYDVQQL -FDNodHRwOi8vcHJvc29keS5pbS9kb2MvYWR2YW5jZWRfc3NsX3RscyNjZXJ0aWZp -Y2F0ZXMxHDAaBgNVBAMTE0V4YW1wbGUgY2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcN -AQEBBQADgY0AMIGJAoGBAN5n5y7+A7V6WZ5n/+n4eqjHiQ+p0XD1BYA2435AgzKE -R+ilmrCFv59aWVIi3jS0YB3goMmuSk8PLv8pi/rjEKYhzDoiuoW/LvzjK5pVzbFM -NlkW5I0t4Lrjb2lMkxbQr/B/k07RDlJJJRTmr2j4N7vMoznVFbjQY6dRAv3svYZF -AgMBAAGjgfswgfgwHQYDVR0OBBYEFJhMTxNc3LEYA1vm3v4sCdHzRnUDMIHIBgNV -HSMEgcAwgb2AFJhMTxNc3LEYA1vm3v4sCdHzRnUDoYGZpIGWMIGTMQswCQYDVQQG -EwJHQjETMBEGA1UECBMKSmFiYmVybGFuZDETMBEGA1UEChMKUHJvc29keSBJTTE8 -MDoGA1UECxQzaHR0cDovL3Byb3NvZHkuaW0vZG9jL2FkdmFuY2VkX3NzbF90bHMj -Y2VydGlmaWNhdGVzMRwwGgYDVQQDExNFeGFtcGxlIGNlcnRpZmljYXRlggkA87U4 -j6+ZSLwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCtLrTOSpQn+j+/ -5zoiP5wAGLpdZE+Iatzd26QwVsL61zd5399nEb1yFs3Hl9jo4W3idyNoofa67atX -2/+3juA0Q/oN/ZT16bWihmcrzv+Qd/CsQfMOZ5ApYV4SEw40L6GITtrZuBDjO4mU -TavhtScoGRzrZavhJG+PyhDH0Scglg== ------END CERTIFICATE----- diff --git a/certs/localhost.key b/certs/localhost.key deleted file mode 100644 index 93fae5ed..00000000 --- a/certs/localhost.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQDeZ+cu/gO1elmeZ//p+Hqox4kPqdFw9QWANuN+QIMyhEfopZqw -hb+fWllSIt40tGAd4KDJrkpPDy7/KYv64xCmIcw6IrqFvy784yuaVc2xTDZZFuSN -LeC6429pTJMW0K/wf5NO0Q5SSSUU5q9o+De7zKM51RW40GOnUQL97L2GRQIDAQAB -AoGAYaWw5Pr12en8CwaSX8GO6SeiT9Q5dqS9Y4u12iqs77MQd16uSi6O8YITkXJp -qS5AvR1wutvhGFEMS0+Me/zRw62OFc2VVrKmX6eqgRMR8d/+SZjqzUxb4pNIAPQU -dHbQzqGXermf6UWm6Cbi7vN0diohd8Qoj98PeWfRQrXju0kCQQD3OXD2SEevEhNe -g4YTREsyUkZV1etkldhAeDAJzlitCQdQF5zE9Wt/Ahv0BKlLTaz3mvSDwrI+lXYQ -1iDzOrXrAkEA5kzu1A3Y2gclyRupTg7crgp+afh1fLKCIVUaFdOYgwQDX90YnnIq -TaY4uQ8Eutoixha4ZM4/bJq17YjjY1O4jwJAZMEHNYftlv7h3/HwMWfy0XZQbej5 -vwuGj3er9EMhRpvYXB7TaD2w6pkcdU11BViJtntzTUOKyxC0hlYOJbJ2swJAOL3N -vhtnSVine6RAE4Zf4tWdDdj0gXOt0i6YjbYjhmwvtKfR0AAK4jTJFvdXT/48wReJ -+PRD9issFck7VRakiwJAPTgFUTsFCR1ZPcuCPHSCK/wz2NFma/O5Eqm0qTIbNUfw -3qDRyUuKbyr3bAc+K+asN5ok2PAnhiRUIpu146M17w== ------END RSA PRIVATE KEY----- |