added new DSA certificates..

8 files changed, 259 insertions, 121 deletions

diff --git a/src/x509/Makefile.am b/src/x509/Makefile.am
index f6168077cf..f483ec46da 100644
--- a/src/x509/Makefile.am
+++ b/src/x509/Makefile.am
@@ -1,2 +1,3 @@
-EXTRA_DIST = ca.pem cert.pem key.pem clikey.pem clicert.pem
+EXTRA_DIST = ca.pem cert.pem key.pem clikey.pem clicert.pem clicert-dsa.pem \
+	clikey-dsa.pem
 
diff --git a/src/x509/ca.pem b/src/x509/ca.pem
index 8a77d91abb..5db2de5aef 100644
--- a/src/x509/ca.pem
+++ b/src/x509/ca.pem
@@ -1,18 +1,56 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=GR, ST=Attiki, L=Athina, O=GNUTLS, OU=GNUTLS dev., CN=GNUTLS TEST CA/Email=gnutls-dev@gnupg.org
+        Validity
+            Not Before: Jul  7 10:18:36 2001 GMT
+            Not After : Jul  5 10:18:36 2011 GMT
+        Subject: C=GR, ST=Attiki, L=Athina, O=GNUTLS, OU=GNUTLS dev., CN=GNUTLS TEST CA/Email=gnutls-dev@gnupg.org
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:ca:fe:f3:02:cc:43:b0:61:22:2a:61:5d:c4:5c:
+                    93:3e:2a:5e:82:64:f6:89:0e:8f:cf:2c:a6:29:d0:
+                    4f:ec:73:c0:08:fb:6c:cc:7d:19:42:c1:cd:2e:83:
+                    9f:a7:22:29:13:4a:ed:08:92:c2:5f:7f:b9:9b:12:
+                    eb:15:21:d2:52:5e:16:80:35:0b:3b:16:aa:48:e0:
+                    aa:2d:6c:db:81:4a:a2:3e:c0:89:5b:4e:0f:01:f7:
+                    8a:5d:00:3f:f8:6e:5a:02:81:ce:a6:d6:b4:47:3b:
+                    2a:1e:10:f8:c9:ae:49:01:42:f8:ca:7e:bc:d5:f7:
+                    e9:23:81:6f:36:19:c3:db:c7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                EF:EE:94:AB:C8:CA:57:7F:53:13:DB:76:DC:1A:95:00:93:BA:F3:C9
+    Signature Algorithm: md5WithRSAEncryption
+        a0:5c:bc:18:41:68:a8:5d:e3:9d:da:15:4b:5b:8a:e7:f6:94:
+        6a:cb:68:45:b1:a4:ce:82:4c:a6:df:51:a2:12:bb:ed:8d:3c:
+        5f:7b:95:07:37:de:81:c6:da:81:84:77:c0:97:78:e9:06:4a:
+        8d:4b:10:03:84:5a:52:3b:ca:bc:c1:59:ff:3b:93:e5:6b:03:
+        88:00:73:c0:20:c7:8a:e6:31:9f:5d:f9:30:ad:ec:fd:73:a8:
+        fc:4f:bb:4e:86:25:4e:f7:92:a0:ea:72:e5:ea:73:64:d3:02:
+        a8:87:8e:00:20:9f:d4:77:b2:1b:f6:3c:9e:c1:4f:09:fd:38:
+        f3:bd
 -----BEGIN CERTIFICATE-----
-MIIC2jCCAkOgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCR1Ix
-DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMRcwFQYDVQQKEw5HTlVU
-TFMgVEVTVCBDQTEWMBQGA1UECxMNR05VVExTIERFVkVMLjEXMBUGA1UEAxMOR05V
-VExTIFRFU1QgQ0ExHTAbBgkqhkiG9w0BCQEWDm5tYXZAaGVsbHVnLmdyMB4XDTAx
-MDcyMDA3MTMyMFoXDTExMDcxODA3MTMyMFowgZgxCzAJBgNVBAYTAkdSMQ8wDQYD
-VQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGluYTEXMBUGA1UEChMOR05VVExTIFRF
-U1QgQ0ExFjAUBgNVBAsTDUdOVVRMUyBERVZFTC4xFzAVBgNVBAMTDkdOVVRMUyBU
-RVNUIENBMR0wGwYJKoZIhvcNAQkBFg5ubWF2QGhlbGx1Zy5ncjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAu3HbtQcFB+lQ/2OPEd14LKLRh3OzTNWZsem2rj6x
-oHTuMaIWGuzgIrJAF92wfx5+qcNJ1ZttbfhHR84dbR8wISxeoTN8jA2vy6w6qsfk
-/kuiZQb7NZML1l2tW+PzESnSxBuJSywoM6nu3Q17UeoZ4l2qgdY90iDI0lxh/0JK
-Oi0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUhJDoDTbwcum9
-BaWIOdcRxlpWRbwwDQYJKoZIhvcNAQEEBQADgYEAcDd/j9F8F0AOPu1LnsS1DquV
-7LNRApEj5OTw6tR7Xih9S8eDY2wzMi9szEykEIQ0qxOamA6V443xq4qDoturX1mg
-E60rHVHNRmy9qcqvMKn7bt+11fgXE4Ya4do+hcBMwjuI4wmXDD160mFiiMHaVmUx
-fy3Pa7F8RfUIMieurAU=
+MIIC0jCCAjugAwIBAgIBADANBgkqhkiG9w0BAQQFADCBlDELMAkGA1UEBhMCR1Ix
+DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMQ8wDQYDVQQKEwZHTlVU
+TFMxFDASBgNVBAsTC0dOVVRMUyBkZXYuMRcwFQYDVQQDEw5HTlVUTFMgVEVTVCBD
+QTEjMCEGCSqGSIb3DQEJARYUZ251dGxzLWRldkBnbnVwZy5vcmcwHhcNMDEwNzA3
+MTAxODM2WhcNMTEwNzA1MTAxODM2WjCBlDELMAkGA1UEBhMCR1IxDzANBgNVBAgT
+BkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMQ8wDQYDVQQKEwZHTlVUTFMxFDASBgNV
+BAsTC0dOVVRMUyBkZXYuMRcwFQYDVQQDEw5HTlVUTFMgVEVTVCBDQTEjMCEGCSqG
+SIb3DQEJARYUZ251dGxzLWRldkBnbnVwZy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAMr+8wLMQ7BhIiphXcRckz4qXoJk9okOj88spinQT+xzwAj7bMx9
+GULBzS6Dn6ciKRNK7QiSwl9/uZsS6xUh0lJeFoA1CzsWqkjgqi1s24FKoj7AiVtO
+DwH3il0AP/huWgKBzqbWtEc7Kh4Q+MmuSQFC+Mp+vNX36SOBbzYZw9vHAgMBAAGj
+MjAwMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFO/ulKvIyld/UxPbdtwalQCT
+uvPJMA0GCSqGSIb3DQEBBAUAA4GBAKBcvBhBaKhd453aFUtbiuf2lGrLaEWxpM6C
+TKbfUaISu+2NPF97lQc33oHG2oGEd8CXeOkGSo1LEAOEWlI7yrzBWf87k+VrA4gA
+c8Agx4rmMZ9d+TCt7P1zqPxPu06GJU73kqDqcuXqc2TTAqiHjgAgn9R3shv2PJ7B
+Twn9OPO9
 -----END CERTIFICATE-----
diff --git a/src/x509/cert.pem b/src/x509/cert.pem
index 274c0016e4..9ee1ab08b8 100644
--- a/src/x509/cert.pem
+++ b/src/x509/cert.pem
@@ -3,58 +3,57 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=GR, ST=Attiki, L=Athina, O=GNUTLS TEST CA, OU=GNUTLS DEVEL., CN=GNUTLS TEST CA/Email=nmav@hellug.gr
+        Issuer: C=GR, ST=Attiki, L=Athina, O=GNUTLS, OU=GNUTLS dev., CN=GNUTLS TEST CA/Email=gnutls-dev@gnupg.org
         Validity
-            Not Before: Jul 20 07:16:46 2001 GMT
-            Not After : Jul 20 07:16:46 2002 GMT
-        Subject: C=GR, ST=Attiki, L=Athina, O=GNUTLS HTTP SERVER, OU=GNUTLS HTTP SERVER, CN=localhost/Email=nmav@hellug.gr
+            Not Before: Jul  7 10:18:45 2001 GMT
+            Not After : Jul  7 10:18:45 2002 GMT
+        Subject: C=GR, ST=Attiki, L=Athina, O=GNUTLS, OU=GNUTLS dev., CN=localhost/Email=root@localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:e0:c3:95:0b:66:ec:bf:a9:1f:9c:34:f6:e2:8f:
-                    5e:22:9a:d4:fe:1a:7b:54:13:cc:39:81:c0:b8:7e:
-                    c1:43:1b:a4:fc:21:33:4d:ac:ac:14:69:d8:64:04:
-                    80:61:28:47:bd:cf:58:68:76:85:23:3c:4a:5a:c4:
-                    97:77:2a:9d:7b:93:45:5b:9b:03:d3:74:ae:db:f2:
-                    67:f5:24:0c:7f:36:82:a3:f0:85:de:b7:e0:ba:72:
-                    2f:39:ef:81:98:a3:12:32:a4:96:c7:36:c5:5b:27:
-                    0e:ff:7e:be:71:4a:23:5e:bf:e0:ef:8d:13:4b:67:
-                    68:d3:b6:88:df:a5:21:73:c1
+                    00:d0:0b:49:eb:b2:26:d9:51:f5:cc:57:07:21:99:
+                    dd:f2:87:68:3d:2d:a1:a0:ef:cc:96:bf:f7:31:64:
+                    77:7c:78:c3:99:1e:92:ed:a6:65:84:e7:b9:7b:ab:
+                    4b:e6:8d:59:5d:22:55:57:e0:1e:7e:57:b5:c3:5c:
+                    04:b4:91:94:8c:5c:42:7a:d5:88:d8:c6:98:97:64:
+                    99:6d:6d:44:e1:7b:65:cc:fc:86:f3:b4:84:2d:e5:
+                    59:b7:30:c1:de:3a:ef:1c:e1:a3:28:af:f8:a3:57:
+                    eb:a9:11:e1:f7:e8:fc:15:98:e2:1e:4b:f7:21:74:
+                    8c:58:7f:50:cf:46:15:7d:95
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Authority Key Identifier: 
-                keyid:84:90:E8:0D:36:F0:72:E9:BD:05:A5:88:39:D7:11:C6:5A:56:45:BC
+                keyid:EF:EE:94:AB:C8:CA:57:7F:53:13:DB:76:DC:1A:95:00:93:BA:F3:C9
 
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication, TLS Web Client Authentication, Microsoft Server Gated Crypto, Netscape Server Gated Crypto
             X509v3 Basic Constraints: critical
                 CA:FALSE
     Signature Algorithm: md5WithRSAEncryption
-        14:5e:87:41:5c:3e:23:69:01:1a:a3:e7:e4:82:f1:98:ee:e0:
-        15:49:f7:79:45:46:6d:2d:e5:83:44:9a:c6:ba:c6:26:a5:a8:
-        94:95:60:f7:1a:03:f0:45:e2:79:97:96:52:fa:cb:35:f7:89:
-        8a:74:5b:08:7e:7e:05:84:a7:17:5a:70:f1:c0:ac:46:a7:c8:
-        3a:4d:38:2a:f0:11:b6:cc:63:5c:b0:2a:2a:dd:37:86:f4:b3:
-        70:dd:0c:d0:f9:53:59:c7:9d:66:d6:f1:03:7f:a4:63:20:58:
-        05:43:78:3c:33:99:bd:9f:a7:5b:bf:64:a6:72:63:f6:02:d0:
-        ec:d3
+        b7:39:45:27:3a:f2:a3:95:ec:54:bf:5d:c6:69:d9:53:88:5a:
+        9d:81:1a:3b:92:90:9d:24:79:2d:36:a4:4e:c2:7e:1c:46:3a:
+        f8:73:8b:ef:d2:9b:31:1c:ce:8c:6d:96:61:be:c3:09:11:da:
+        ab:b3:9b:88:13:38:2b:32:d2:e2:59:58:1e:bc:d2:6c:49:5c:
+        08:39:84:76:39:66:ff:35:d1:de:fe:43:28:91:e6:10:c8:50:
+        72:57:8d:a7:42:32:44:a8:f5:99:7b:41:a1:f4:4e:61:f4:f2:
+        2c:94:37:57:75:05:5a:5e:72:f2:5d:5e:45:57:46:7a:91:bd:
+        42:51
 -----BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCR1Ix
-DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMRcwFQYDVQQKEw5HTlVU
-TFMgVEVTVCBDQTEWMBQGA1UECxMNR05VVExTIERFVkVMLjEXMBUGA1UEAxMOR05V
-VExTIFRFU1QgQ0ExHTAbBgkqhkiG9w0BCQEWDm5tYXZAaGVsbHVnLmdyMB4XDTAx
-MDcyMDA3MTY0NloXDTAyMDcyMDA3MTY0NlowgZwxCzAJBgNVBAYTAkdSMQ8wDQYD
-VQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGluYTEbMBkGA1UEChMSR05VVExTIEhU
-VFAgU0VSVkVSMRswGQYDVQQLExJHTlVUTFMgSFRUUCBTRVJWRVIxEjAQBgNVBAMT
-CWxvY2FsaG9zdDEdMBsGCSqGSIb3DQEJARYObm1hdkBoZWxsdWcuZ3IwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBAODDlQtm7L+pH5w09uKPXiKa1P4ae1QTzDmB
-wLh+wUMbpPwhM02srBRp2GQEgGEoR73PWGh2hSM8SlrEl3cqnXuTRVubA9N0rtvy
-Z/UkDH82gqPwhd634LpyLznvgZijEjKklsc2xVsnDv9+vnFKI16/4O+NE0tnaNO2
-iN+lIXPBAgMBAAGjZzBlMB8GA1UdIwQYMBaAFISQ6A028HLpvQWliDnXEcZaVkW8
-MDQGA1UdJQQtMCsGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZI
-AYb4QgQBMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEEBQADgYEAFF6HQVw+I2kB
-GqPn5ILxmO7gFUn3eUVGbS3lg0SaxrrGJqWolJVg9xoD8EXieZeWUvrLNfeJinRb
-CH5+BYSnF1pw8cCsRqfIOk04KvARtsxjXLAqKt03hvSzcN0M0PlTWcedZtbxA3+k
-YyBYBUN4PDOZvZ+nW79kpnJj9gLQ7NM=
+MIIC/DCCAmWgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlDELMAkGA1UEBhMCR1Ix
+DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMQ8wDQYDVQQKEwZHTlVU
+TFMxFDASBgNVBAsTC0dOVVRMUyBkZXYuMRcwFQYDVQQDEw5HTlVUTFMgVEVTVCBD
+QTEjMCEGCSqGSIb3DQEJARYUZ251dGxzLWRldkBnbnVwZy5vcmcwHhcNMDEwNzA3
+MTAxODQ1WhcNMDIwNzA3MTAxODQ1WjCBiTELMAkGA1UEBhMCR1IxDzANBgNVBAgT
+BkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMQ8wDQYDVQQKEwZHTlVUTFMxFDASBgNV
+BAsTC0dOVVRMUyBkZXYuMRIwEAYDVQQDEwlsb2NhbGhvc3QxHTAbBgkqhkiG9w0B
+CQEWDnJvb3RAbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDQ
+C0nrsibZUfXMVwchmd3yh2g9LaGg78yWv/cxZHd8eMOZHpLtpmWE57l7q0vmjVld
+IlVX4B5+V7XDXAS0kZSMXEJ61YjYxpiXZJltbUThe2XM/IbztIQt5Vm3MMHeOu8c
+4aMor/ijV+upEeH36PwVmOIeS/chdIxYf1DPRhV9lQIDAQABo2cwZTAfBgNVHSME
+GDAWgBTv7pSryMpXf1MT23bcGpUAk7rzyTA0BgNVHSUELTArBggrBgEFBQcDAQYI
+KwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATAMBgNVHRMBAf8EAjAAMA0G
+CSqGSIb3DQEBBAUAA4GBALc5RSc68qOV7FS/XcZp2VOIWp2BGjuSkJ0keS02pE7C
+fhxGOvhzi+/SmzEczoxtlmG+wwkR2quzm4gTOCsy0uJZWB680mxJXAg5hHY5Zv81
+0d7+QyiR5hDIUHJXjadCMkSo9Zl7QaH0TmH08iyUN1d1BVpecvJdXkVXRnqRvUJR
 -----END CERTIFICATE-----
diff --git a/src/x509/clicert-dsa.pem b/src/x509/clicert-dsa.pem
new file mode 100644
index 0000000000..b0a757220e
--- /dev/null
+++ b/src/x509/clicert-dsa.pem
@@ -0,0 +1,88 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 5 (0x5)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=GR, ST=Attiki, L=Athina, O=GNUTLS, OU=GNUTLS dev., CN=GNUTLS TEST CA/Email=gnutls-dev@gnupg.org
+        Validity
+            Not Before: Jan 26 21:12:49 2002 GMT
+            Not After : Jan 26 21:12:49 2003 GMT
+        Subject: CN=Mr. User DSA/Email=kaka@hello.org
+        Subject Public Key Info:
+            Public Key Algorithm: dsaEncryption
+            DSA Public Key:
+                pub: 
+                    06:b3:60:21:4e:d8:6d:45:99:2f:68:7f:59:b0:eb:
+                    3d:c4:c1:c9:aa:af:f8:3e:bc:a5:65:ca:40:1c:2f:
+                    8a:cf:41:aa:5c:d9:80:6c:8e:db:00:f0:a0:02:75:
+                    31:a4:33:61:f7:12:b5:f4:33:87:4f:26:9e:c1:18:
+                    5a:e4:1c:00:42:67:79:5b:09:c0:95:e5:d3:73:da:
+                    6e:27:00:37:9e:db:9c:5b:d0:9e:88:16:bb:1b:46:
+                    f1:51:f9:11:1d:65:64:51:bb:bb:23:d6:04:84:55:
+                    73:93:e9:06:23:d2:b9:ec:96:8e:98:24:f2:5a:64:
+                    b4:52:ca:c6:82:86:b2:03
+                P:   
+                    00:ac:18:75:bc:98:81:29:9c:ef:3f:82:d2:cf:64:
+                    a5:d8:84:3f:bf:27:a2:fa:a6:fc:62:16:6a:29:8d:
+                    43:30:61:01:89:95:7c:25:16:74:4a:f9:3f:0e:95:
+                    8c:a8:d0:cc:39:ea:6d:fb:58:25:bd:26:5a:3a:11:
+                    06:1e:cc:3b:18:8f:d0:2c:8d:d7:a8:8f:ab:5c:f1:
+                    6c:74:cb:e3:74:8c:f2:19:e1:32:e5:4c:09:b9:70:
+                    dc:b1:41:b1:53:8b:eb:17:ed:a8:9b:93:b9:ff:9b:
+                    0b:3a:fe:0e:be:7c:5c:ed:e5:45:2f:c4:24:10:65:
+                    76:72:32:9f:5c:21:22:01:e5
+                Q:   
+                    00:e2:3a:5f:d8:8b:12:26:94:b4:ad:e8:88:47:08:
+                    6f:1b:1e:23:b1:83
+                G:   
+                    4f:4a:70:d2:f4:d0:7d:34:2c:81:2c:28:89:3a:d5:
+                    4c:fb:8c:53:45:26:c1:36:99:b1:b6:45:ed:ed:89:
+                    91:7f:1f:55:f7:63:9b:93:3e:9f:5d:1e:62:92:3d:
+                    6c:24:26:0d:8d:fd:83:6b:ba:e8:bf:f8:67:5a:6e:
+                    34:5f:a2:ba:6b:f4:a3:30:2f:48:6a:77:d1:09:cb:
+                    55:fe:be:6c:f1:ce:b3:18:02:8c:0c:1e:ed:09:e1:
+                    e2:2f:11:89:f8:27:90:f8:de:af:f2:b5:4e:b4:d7:
+                    98:77:9a:e6:f5:2d:4d:93:e7:39:da:00:56:94:6f:
+                    89:b6:ed:14:fc:14:a4:ad
+        X509v3 extensions:
+            X509v3 Subject Alternative Name: 
+                email:kaka@hello.org
+            X509v3 Basic Constraints: critical
+                CA:FALSE
+            X509v3 Authority Key Identifier: 
+                keyid:EF:EE:94:AB:C8:CA:57:7F:53:13:DB:76:DC:1A:95:00:93:BA:F3:C9
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication, E-mail Protection
+    Signature Algorithm: md5WithRSAEncryption
+        47:23:64:2c:ca:d1:59:3e:d1:dc:71:01:44:94:22:a7:b6:29:
+        14:a0:20:21:40:ed:88:c3:dd:67:60:8c:8a:c8:04:c5:40:db:
+        4a:54:00:22:e4:0a:47:70:a4:87:50:43:97:13:2c:6e:6f:57:
+        31:61:3d:73:bb:36:38:61:a5:ba:79:f2:75:9f:2c:6c:1d:6a:
+        a8:2f:e8:25:22:ab:6a:87:6f:fb:85:9b:f7:fb:32:0e:70:e4:
+        6b:e3:db:2b:23:fb:df:4f:da:51:fb:72:90:6f:03:03:8b:39:
+        c9:a3:b7:12:4f:96:f2:17:70:34:2a:fe:91:a4:b4:1e:10:78:
+        94:2c
+-----BEGIN CERTIFICATE-----
+MIIDxDCCAy2gAwIBAgIBBTANBgkqhkiG9w0BAQQFADCBlDELMAkGA1UEBhMCR1Ix
+DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMQ8wDQYDVQQKEwZHTlVU
+TFMxFDASBgNVBAsTC0dOVVRMUyBkZXYuMRcwFQYDVQQDEw5HTlVUTFMgVEVTVCBD
+QTEjMCEGCSqGSIb3DQEJARYUZ251dGxzLWRldkBnbnVwZy5vcmcwHhcNMDIwMTI2
+MjExMjQ5WhcNMDMwMTI2MjExMjQ5WjA2MRUwEwYDVQQDEwxNci4gVXNlciBEU0Ex
+HTAbBgkqhkiG9w0BCQEWDmtha2FAaGVsbG8ub3JnMIIBtjCCASsGByqGSM44BAEw
+ggEeAoGBAKwYdbyYgSmc7z+C0s9kpdiEP78novqm/GIWaimNQzBhAYmVfCUWdEr5
+Pw6VjKjQzDnqbftYJb0mWjoRBh7MOxiP0CyN16iPq1zxbHTL43SM8hnhMuVMCblw
+3LFBsVOL6xftqJuTuf+bCzr+Dr58XO3lRS/EJBBldnIyn1whIgHlAhUA4jpf2IsS
+JpS0reiIRwhvGx4jsYMCgYBPSnDS9NB9NCyBLCiJOtVM+4xTRSbBNpmxtkXt7YmR
+fx9V92Obkz6fXR5ikj1sJCYNjf2Da7rov/hnWm40X6K6a/SjMC9IanfRCctV/r5s
+8c6zGAKMDB7tCeHiLxGJ+CeQ+N6v8rVOtNeYd5rm9S1Nk+c52gBWlG+Jtu0U/BSk
+rQOBhAACgYAGs2AhTthtRZkvaH9ZsOs9xMHJqq/4PrylZcpAHC+Kz0GqXNmAbI7b
+APCgAnUxpDNh9xK19DOHTyaewRha5BwAQmd5WwnAleXTc9puJwA3ntucW9CeiBa7
+G0bxUfkRHWVkUbu7I9YEhFVzk+kGI9K57JaOmCTyWmS0UsrGgoayA6NrMGkwGQYD
+VR0RBBIwEIEOa2FrYUBoZWxsby5vcmcwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAW
+gBTv7pSryMpXf1MT23bcGpUAk7rzyTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwQwDQYJKoZIhvcNAQEEBQADgYEARyNkLMrRWT7R3HEBRJQip7YpFKAgIUDt
+iMPdZ2CMisgExUDbSlQAIuQKR3Ckh1BDlxMsbm9XMWE9c7s2OGGlunnydZ8sbB1q
+qC/oJSKraodv+4Wb9/syDnDka+PbKyP730/aUftykG8DA4s5yaO3Ek+W8hdwNCr+
+kaS0HhB4lCw=
+-----END CERTIFICATE-----
diff --git a/src/x509/clicert.pem b/src/x509/clicert.pem
index feb86eeb1f..51ff4a74f5 100644
--- a/src/x509/clicert.pem
+++ b/src/x509/clicert.pem
@@ -1,60 +1,60 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 2 (0x2)
+        Serial Number: 4 (0x4)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=GR, ST=Attiki, L=Athina, O=GNUTLS TEST CA, OU=GNUTLS DEVEL., CN=GNUTLS TEST CA/Email=nmav@hellug.gr
+        Issuer: C=GR, ST=Attiki, L=Athina, O=GNUTLS, OU=GNUTLS dev., CN=GNUTLS TEST CA/Email=gnutls-dev@gnupg.org
         Validity
-            Not Before: Aug  6 19:51:34 2001 GMT
-            Not After : Aug  6 19:51:34 2002 GMT
-        Subject: CN=Mr. Client/Email=client@hello.org
+            Not Before: Jan 26 21:05:06 2002 GMT
+            Not After : Jan 26 21:05:06 2003 GMT
+        Subject: CN=Mr. User RSA/Email=koko@hello.org
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:e5:8a:96:25:ba:98:6d:4a:34:02:e8:80:41:50:
-                    a1:b7:09:ad:b0:ec:43:bc:ec:ab:35:d3:7c:62:5a:
-                    08:02:1e:6e:f8:e4:d0:2b:4d:6a:4c:89:19:74:a3:
-                    17:f4:ae:f9:f8:7d:e2:8c:71:56:9c:48:3d:5b:1e:
-                    e5:22:ce:e5:39:d6:75:cd:30:36:c4:e0:25:bc:74:
-                    c1:ce:64:70:48:d4:d6:a7:94:62:d4:80:4a:bf:ae:
-                    e4:5d:e5:f3:0a:e7:6c:54:84:47:29:d0:89:f9:75:
-                    16:92:40:27:be:42:b6:be:ad:e2:27:93:4e:96:e6:
-                    38:ec:b1:bb:90:69:47:b0:09
+                    00:ca:8a:f8:cb:a5:e9:a5:d8:62:0d:b0:08:a6:0b:
+                    ac:70:4f:18:f8:e2:62:dc:c5:2f:ae:eb:dc:85:5c:
+                    58:36:67:f0:1e:a5:45:3e:22:f7:ea:54:e7:91:56:
+                    08:35:58:7a:e1:f8:36:4b:ba:80:ba:93:09:fb:6b:
+                    66:9f:51:3c:f2:b6:b2:13:2a:78:be:27:5e:04:35:
+                    af:d9:70:5d:8c:ae:14:8c:f1:66:75:35:6a:e6:bd:
+                    49:6d:8e:46:c9:40:8c:32:54:fb:88:c1:e4:47:d4:
+                    40:aa:48:5c:55:a8:14:fc:47:06:19:db:b1:73:4c:
+                    bf:16:17:52:67:95:29:4a:b9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Alternative Name: 
-                email:client@hello.org
+                email:koko@hello.org
             X509v3 Basic Constraints: critical
                 CA:FALSE
             X509v3 Authority Key Identifier: 
-                keyid:84:90:E8:0D:36:F0:72:E9:BD:05:A5:88:39:D7:11:C6:5A:56:45:BC
+                keyid:EF:EE:94:AB:C8:CA:57:7F:53:13:DB:76:DC:1A:95:00:93:BA:F3:C9
 
             X509v3 Extended Key Usage: 
                 TLS Web Client Authentication, E-mail Protection
     Signature Algorithm: md5WithRSAEncryption
-        2c:b4:1e:18:cf:ce:12:61:a6:1c:83:4c:4a:df:4f:d8:58:8b:
-        54:96:8e:06:d6:80:bb:0d:82:15:81:c8:e2:eb:eb:ce:1c:8b:
-        da:98:90:64:5b:88:0b:a7:1f:93:c7:81:c3:69:9e:d9:e5:d4:
-        3c:d2:b6:47:71:7a:46:59:5d:38:ac:8f:9f:22:39:8d:73:e5:
-        73:ad:59:bc:e7:a8:ac:2d:8a:54:60:90:ea:3d:86:18:d6:f4:
-        32:7a:5d:c0:8d:2f:59:1c:ca:71:1d:7d:52:7f:75:24:ad:66:
-        24:b3:1d:66:ae:c1:48:81:5d:e9:8f:0b:f9:d8:8f:94:e6:93:
-        c6:fa
+        73:67:d5:4d:32:1f:d3:f2:de:2d:27:2d:41:1f:f2:ed:db:cf:
+        ec:c3:96:27:6b:ee:4e:e6:db:ec:34:1b:69:4f:e3:7e:14:c7:
+        bc:47:fb:5b:6b:ba:5f:5b:11:c5:ed:be:e4:f0:b9:8b:ed:65:
+        1b:f1:18:4d:67:15:a4:92:14:07:f6:67:e5:ed:14:5d:04:b0:
+        f2:b3:22:14:ba:2f:5b:d8:df:5c:90:6c:0d:56:a6:48:e3:bc:
+        09:56:f5:4e:d2:d0:46:a4:88:58:63:b2:97:04:00:d9:d9:32:
+        31:f6:cb:11:57:13:d8:e1:a5:fb:0e:bc:33:00:9b:33:67:ef:
+        70:ed
 -----BEGIN CERTIFICATE-----
-MIICsjCCAhugAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCR1Ix
-DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMRcwFQYDVQQKEw5HTlVU
-TFMgVEVTVCBDQTEWMBQGA1UECxMNR05VVExTIERFVkVMLjEXMBUGA1UEAxMOR05V
-VExTIFRFU1QgQ0ExHTAbBgkqhkiG9w0BCQEWDm5tYXZAaGVsbHVnLmdyMB4XDTAx
-MDgwNjE5NTEzNFoXDTAyMDgwNjE5NTEzNFowNjETMBEGA1UEAxMKTXIuIENsaWVu
-dDEfMB0GCSqGSIb3DQEJARYQY2xpZW50QGhlbGxvLm9yZzCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA5YqWJbqYbUo0AuiAQVChtwmtsOxDvOyrNdN8YloIAh5u
-+OTQK01qTIkZdKMX9K75+H3ijHFWnEg9Wx7lIs7lOdZ1zTA2xOAlvHTBzmRwSNTW
-p5Ri1IBKv67kXeXzCudsVIRHKdCJ+XUWkkAnvkK2vq3iJ5NOluY47LG7kGlHsAkC
-AwEAAaNtMGswGwYDVR0RBBQwEoEQY2xpZW50QGhlbGxvLm9yZzAMBgNVHRMBAf8E
-AjAAMB8GA1UdIwQYMBaAFISQ6A028HLpvQWliDnXEcZaVkW8MB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQQFAAOBgQAstB4Yz84SYaYc
-g0xK30/YWItUlo4G1oC7DYIVgcji6+vOHIvamJBkW4gLpx+Tx4HDaZ7Z5dQ80rZH
-cXpGWV04rI+fIjmNc+VzrVm856isLYpUYJDqPYYY1vQyel3AjS9ZHMpxHX1Sf3Uk
-rWYksx1mrsFIgV3pjwv52I+U5pPG+g==
+MIICrDCCAhWgAwIBAgIBBDANBgkqhkiG9w0BAQQFADCBlDELMAkGA1UEBhMCR1Ix
+DzANBgNVBAgTBkF0dGlraTEPMA0GA1UEBxMGQXRoaW5hMQ8wDQYDVQQKEwZHTlVU
+TFMxFDASBgNVBAsTC0dOVVRMUyBkZXYuMRcwFQYDVQQDEw5HTlVUTFMgVEVTVCBD
+QTEjMCEGCSqGSIb3DQEJARYUZ251dGxzLWRldkBnbnVwZy5vcmcwHhcNMDIwMTI2
+MjEwNTA2WhcNMDMwMTI2MjEwNTA2WjA2MRUwEwYDVQQDEwxNci4gVXNlciBSU0Ex
+HTAbBgkqhkiG9w0BCQEWDmtva29AaGVsbG8ub3JnMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDKivjLpeml2GINsAimC6xwTxj44mLcxS+u69yFXFg2Z/AepUU+
+IvfqVOeRVgg1WHrh+DZLuoC6kwn7a2afUTzytrITKni+J14ENa/ZcF2MrhSM8WZ1
+NWrmvUltjkbJQIwyVPuIweRH1ECqSFxVqBT8RwYZ27FzTL8WF1JnlSlKuQIDAQAB
+o2swaTAZBgNVHREEEjAQgQ5rb2tvQGhlbGxvLm9yZzAMBgNVHRMBAf8EAjAAMB8G
+A1UdIwQYMBaAFO/ulKvIyld/UxPbdtwalQCTuvPJMB0GA1UdJQQWMBQGCCsGAQUF
+BwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQQFAAOBgQBzZ9VNMh/T8t4tJy1BH/Lt
+28/sw5Yna+5O5tvsNBtpT+N+FMe8R/tba7pfWxHF7b7k8LmL7WUb8RhNZxWkkhQH
+9mfl7RRdBLDysyIUui9b2N9ckGwNVqZI47wJVvVO0tBGpIhYY7KXBADZ2TIx9ssR
+VxPY4aX7DrwzAJszZ+9w7Q==
 -----END CERTIFICATE-----
diff --git a/src/x509/clikey-dsa.pem b/src/x509/clikey-dsa.pem
new file mode 100644
index 0000000000..999d2fc0f6
--- /dev/null
+++ b/src/x509/clikey-dsa.pem
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBugIBAAKBgQCsGHW8mIEpnO8/gtLPZKXYhD+/J6L6pvxiFmopjUMwYQGJlXwl
+FnRK+T8OlYyo0Mw56m37WCW9Jlo6EQYezDsYj9Asjdeoj6tc8Wx0y+N0jPIZ4TLl
+TAm5cNyxQbFTi+sX7aibk7n/mws6/g6+fFzt5UUvxCQQZXZyMp9cISIB5QIVAOI6
+X9iLEiaUtK3oiEcIbxseI7GDAoGAT0pw0vTQfTQsgSwoiTrVTPuMU0UmwTaZsbZF
+7e2JkX8fVfdjm5M+n10eYpI9bCQmDY39g2u66L/4Z1puNF+iumv0ozAvSGp30QnL
+Vf6+bPHOsxgCjAwe7Qnh4i8RifgnkPjer/K1TrTXmHea5vUtTZPnOdoAVpRvibbt
+FPwUpK0CgYAGs2AhTthtRZkvaH9ZsOs9xMHJqq/4PrylZcpAHC+Kz0GqXNmAbI7b
+APCgAnUxpDNh9xK19DOHTyaewRha5BwAQmd5WwnAleXTc9puJwA3ntucW9CeiBa7
+G0bxUfkRHWVkUbu7I9YEhFVzk+kGI9K57JaOmCTyWmS0UsrGgoayAwIUH0Y8uucT
+n+JAU+T4tPGV+W3LXrg=
+-----END DSA PRIVATE KEY-----
diff --git a/src/x509/clikey.pem b/src/x509/clikey.pem
index 5b987fb013..3c0f40d602 100644
--- a/src/x509/clikey.pem
+++ b/src/x509/clikey.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDlipYluphtSjQC6IBBUKG3Ca2w7EO87Ks103xiWggCHm745NAr
-TWpMiRl0oxf0rvn4feKMcVacSD1bHuUizuU51nXNMDbE4CW8dMHOZHBI1NanlGLU
-gEq/ruRd5fMK52xUhEcp0In5dRaSQCe+Qra+reInk06W5jjssbuQaUewCQIDAQAB
-AoGAIjAG9u2YwEZaAsjgOVoqC9n8Laqy2BOj2Gt8TiW8pZwkyRtDSf/Iwkd1LCMS
-cVYSUwlk0agbz0EPKmAqnomUKEXsFzX20jNhZhqjO1pKlg/bEoG2s9rYHoFBvJAf
-ub819IbjF9mNMzDZ/QATMcJsQgCOxrp/CF0zRBecg370uIUCQQDzQ+3KyZ5gC4de
-o+ZBT1gOIuNq8KzgSz7aXAwF71Pfj/5818/8XHybIsoRUWpYQ5jpfSUn6paRX+fo
-TfqtyTwDAkEA8Y69AurnV0cYUIqXSt0pQdVn4BWBudu/NsWXJMzF7eCyU0r7L3+I
-LhVNwSbLyE1ROtc4QYn0hfQ8BhMm6WlUAwJANSOlkiKwwfJCw92xspqOdagRXY7t
-dKF7PV/WEIXTIIbn5IWQHWRmo8zZrybFwDoj8P0xXKLV+TOmCQzfsY6/2QJABeLh
-jjmlK4ZK/GN0LlnXUIhfwKEliR7muPH1rerjg9lu3wK7vjuQWPch7uwAGUBxE0r9
-TvOKptz9vXQoBZYQewJAYXA4EtKXKSpWqjK+nkOJX4cU8DWbBveNXY2dCQHuAe24
-0KTwO17CrwTlmH7/oaQnAgANfGSVj/3UDxmY0UxUrQ==
+MIICXQIBAAKBgQDKivjLpeml2GINsAimC6xwTxj44mLcxS+u69yFXFg2Z/AepUU+
+IvfqVOeRVgg1WHrh+DZLuoC6kwn7a2afUTzytrITKni+J14ENa/ZcF2MrhSM8WZ1
+NWrmvUltjkbJQIwyVPuIweRH1ECqSFxVqBT8RwYZ27FzTL8WF1JnlSlKuQIDAQAB
+AoGAbn68VhUwTxqp+3+iaDuMGkT8gaK3fmtQpSPlTRfgw+WWGJHfIZPgHgWtwxrl
+JX0cpLRNoqifW6ml03R3Kskd7u7OX5J2IIGEo5cgKUT0e1sasi21eRQsHb8N2E3h
+MLeESijytvPQrxUazOZ2ff3rPAr0bYPNWW4hHJ9jNQ5rewECQQDt29FXygS3XJBb
+C9ijo+rI92S0sjFdScFylJJElplNPlkFTyPyCNjjDFYAJ9kQgcSQJiskuikldco7
+OxhmFbmZAkEA2f2dPv9iep25VrU2qH8AjJPB4O09lOLjUsWWZrKulNFKq6BHhdR+
+7rpRmFbwQXFkl+dBCMl4OeYoTjn526YOIQJACSc+ZRx3Ff9P5tEL4zA5psYub+2z
+jJ17/kbNYipRd/GAR34GKhhBEGu3G4ZtCf+Uat+tJVqsnq5ru9/ITpVjcQJBALmz
++f8u5J/8OWWKXpPQDZG0VhfdQvbRCkL7HBNE6MDSQsBOfF+gFLoec2BJv8agaMeX
+M6nep9L7JR7u+NGLdsECQQCI+GN7oL/6Gx23LZsIoeRFwYjc/i6A6a+80UWwbctJ
+T1a9N5uQAas5CWCuWMUq+jIOx2a94LdeOv+//QM8qwAr
 -----END RSA PRIVATE KEY-----
diff --git a/src/x509/key.pem b/src/x509/key.pem
index 1607a9bdc4..885fc9f686 100644
--- a/src/x509/key.pem
+++ b/src/x509/key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDgw5ULZuy/qR+cNPbij14imtT+GntUE8w5gcC4fsFDG6T8ITNN
-rKwUadhkBIBhKEe9z1hodoUjPEpaxJd3Kp17k0VbmwPTdK7b8mf1JAx/NoKj8IXe
-t+C6ci8574GYoxIypJbHNsVbJw7/fr5xSiNev+DvjRNLZ2jTtojfpSFzwQIDAQAB
-AoGBAMQV/TaYUZ0X1+r4ThbzysVX3M/enI+KQhY9e7u5YbPBL1uDP3XZWbrpaI5B
-WxroAEa42MEx/Q7zb07mydl9xSrCPyknoksLQCX6M6mAO7MhYNLmQK75XC9B1XtY
-nbaR0mn81V25isrn/NM7UyU0rx94o5wF9sZcIYPPe1eYGeANAkEA+YrYTfBlxfXB
-uvfcXwPLaYtFFa2ujBYWcG1qZ0YcZCWGstCLkEE5hLtOSfhuqwP5ID9AGOkQbX9d
-547AZgXe4wJBAOaUljpyk4z1Hz0cykHrRAiNhYkVQ7TEFltwDjdp3wezBmJL3Ywx
-97QV+BoXKYb0yd73FyG7H+x3dZSF2JORoAsCQCeRtKrnK7wwNAAJvY/zchXSV6oQ
-WFUuS3CYaP7nRyk6KhnAp+C/9vbtHITuN942SxKp9Of+TPSP9bv6DtgepjECQCsX
-qdvSffDh/qyVLNeU+GoAyOwNpVGrM+Jy1rVUe/Icax0DwKvqyrhFQtDdc01dgjzB
-QPl010qCKN9RBGDP3nECQF23yIrdYK7ik8D+985tfM387lEU9KXXI0WC9x04U+bO
-ROivdH5QHqM/49WyOPmFRC1SO1EdDd/CrpEv484HFRk=
+MIICXAIBAAKBgQDQC0nrsibZUfXMVwchmd3yh2g9LaGg78yWv/cxZHd8eMOZHpLt
+pmWE57l7q0vmjVldIlVX4B5+V7XDXAS0kZSMXEJ61YjYxpiXZJltbUThe2XM/Ibz
+tIQt5Vm3MMHeOu8c4aMor/ijV+upEeH36PwVmOIeS/chdIxYf1DPRhV9lQIDAQAB
+AoGAG+9oHZ3uWYAH4UhOTNS8WLSV6qEV8uZAMn3UU22KHcyZdxYD5KVTPGVhIpn9
+txeDyF2z1/jgH1bnsTPJ7fUeXPx5uVyuatiFUn5IM+od4OtLQJ5MeRWYQlGdHv/w
+XO2TtwekwzkZTtoFvIph7zHqP6pub4UGQ7VrgVSm/syWmIECQQDyOysujmEZ7l4C
+C7Tzn+4HmPtGWN1G8ga8XRJuQKagrBoq2oZFfRMC6uCYFPTh+nstRL8WsrnYmzaz
+ZQ00NQPfAkEA296lkzP3AdaWXvv4LMrMFlrm2D4p6r01xHcKUHynXyFdJa8vC6F/
+8bpO/Rp20EX6oiDOWd6ue9kyjGB8nOQNCwJAfWXCEgTlIa5zfi2fTGujps08b4t7
+acnLUOIBs4/GcvEFTt/3mKuKFv2OrUxUBVRNRf8LyW1Wplqbs70BW+CCEwJAOWKu
+EnKAqKEqVBYtmvs/MyJ8l7n51MOXkfSD46f1QzYBCsHjZIS9UQkQbq0Gj6uEE+a+
+FOSy4643rD3OqGA5KwJBANwtHo4yL3aRK5aIKR6y13/NxY8XrpjX5JIiQzwADCLq
+tMVApB6zxFAOzrTnCe0c8kzVxhoVbs28IOFnl/QZ2B8=
 -----END RSA PRIVATE KEY-----