1 files changed, 62 insertions, 46 deletions
diff --git a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml
index e0cec655..aa77432f 100644
--- a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml
+++ b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml
@@ -21,29 +21,37 @@
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
-                        VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
-                        MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
-                        ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
-                        aW5hY2FkZW1pYS5vcmcwHhcNMTQxMDMxMTExMTIzWhcNMjQxMDI4MTExMTIzWjCB
-                        pDELMAkGA1UEBhMCRVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEDAOBgNVBAcMB1V0
-                        cmVjaHQxEzARBgNVBAoMCkluQWNhZGVtaWExHDAaBgNVBAsME1NpZ25pbmcgQ2Vy
-                        dGlmaWNhdGUxFzAVBgNVBAMMDmluYWNhZGVtaWEub3JnMSIwIAYJKoZIhvcNAQkB
-                        FhN0ZWNoQGluYWNhZGVtaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                        CgKCAQEAzGqetfNkkqINY4voyJoSBZ3zKzGcQzC7f9ei9EF2bcBk20YQY8ZTDLY6
-                        BG7TPb0kZQbeFsOLAcup/XZ4+RQiS6WAKmqUQrn7bISn0ayWW3SBO7IBu6mi2Sg0
-                        a+kDyEt/IUL4brUB1Ou5pL9ZYA1sNbfFc+k6PIbphlk4hnoZrdyMymlTXhv00p0S
-                        EaqEBf3kz62yW7dZQNCwmGR6zZMTAEYz5Irrj/99776iqNfOR7upmoeWqD35HkvZ
-                        GiJOzOxHdnabGvlBJrmLrjO4NcHIXcDCoBYfc8jfLprgll/D303f0dG2XhXSowzj
-                        T2vQ4J4EM3Y98Q9s1aqqvzk7A46mIQIDAQABo1AwTjAdBgNVHQ4EFgQUJAE/7/YL
-                        LSZ9qZjnQgiekxqHDwswHwYDVR0jBBgwFoAUJAE/7/YLLSZ9qZjnQgiekxqHDwsw
-                        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV/1tjVGo9EF7rzPwZrTA
-                        aeV/TRshMFlMNyAiElMpQmpkoL79AXP7biNqBJbG5CwpBPwai6PNFkRACKeZT8WT
-                        JsrjNUG9BtKeUxPD45RHAGjZr5UpMe6vNZb12BaUYeCfxlzpOU/7kKK5QvYwFcVY
-                        KL+9MK0bHP0UzkefyyeU+CajYMGJc9fZGWSz3w9vcPAREEVXLc+lmCXT2Y7YoMmX
-                        ZCGGK52oyl1XLxxGngqCUjnNrWfch5JAvq6vF/ci5cIC77ukgZB9FExkC8INwtKC
-                        GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
-                        NA==
+          <ds:X509Certificate>MIIFrzCCA5egAwIBAgIJAJ7He1WDjB6qMA0GCSqGSIb3DQEBCwUAMG4xCzAJBgNV
+                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
+                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
+                        bWlhLm9yZzAeFw0xNzA3MDUxNjIxNDNaFw0yNzA3MDMxNjIxNDNaMG4xCzAJBgNV
+                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
+                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
+                        bWlhLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5A2uV67ia4
+                        FD5vvzZiNsP5XcdaSxqkDxzf+zC4JfnY+2xRsxdCtznxCc1dfsrT4dbg/xfXfced
+                        Fxz0GcNIXM6eQkxFUztUbIgkKjt8m2wsDHiByiG7b3PtAqh+ZozttDW5cKNMf67c
+                        2qWS6g0/ZqDhGuyEVYpRVmFpKJ56/yGvSle5QLV2u/TEhJCt8z/4/EZdzjEY6ljb
+                        M/LCbfPyJHgiPJZf6+oKvKVQrdixe88/Jy+ISRCGWoCyhs1LHLqs/17nK4huej/w
+                        dmzn/e5Md6OFxnb6sJkNUmb3wCWyi03KJCR4W/I2LX0BKR38yQAf2YKaU2a77UN8
+                        WYTDfgjyW8WbqTpZ85S3l1WKJ2dEiTiIvAfoodSgRye0YVBcZtcleMT+MAmZBKp7
+                        TsBuCS78CZ7kr9BEKkR5c8bvjkCvcUzJK84WAdX2vsazhnF5oUT1QNeNe2LF51OD
+                        VTQOPvDuI3upEJuZtQiHAKHvlApzm68LqtB+QI7YEqisMBu0q5xs8WSMEHakJa0y
+                        cWEQPYaALZP09h06OSuUXWdXDFgJn9APDWEXtjZJq9zD/1E0cMjVm7cGpmAmH/Cv
+                        9CfXL3YzYV25doENWiYP3AibLvs7RueYjr0iWpLZmi15tBgu3c991PkI2zx1n/uD
+                        YHBMzLvjBSr72Tt4QigWMLVQR6PEDMONAgMBAAGjUDBOMB0GA1UdDgQWBBS2ESl6
+                        idHz81HR/aAzMpc+wG+HLzAfBgNVHSMEGDAWgBS2ESl6idHz81HR/aAzMpc+wG+H
+                        LzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAlf6ttaoNN00b8PQS4
+                        qsbuFIa/pxOKIRnchIMXWB1L/+0I5zdupkZ2Uumy6iunfpvNpWjrTY1hLZa+HtOD
+                        Bquxan6QUm4+dmkfg1y0tzseZiKj2ZLy8wxsrLLf+q1EmHHKvuBDsn52OVWBZG/p
+                        BbLT/uCwJaM7AnfIppETpGL4DFCkFspeLY2mgLqfz9fMRLeJRgPyXamS2CuB/bbX
+                        GKCMlFjOKrRb1GNYu79IBNjKxIDnIV4IgqUhkTnRLqxfrexWQU9ANyCX/kexsAeU
+                        pOvzwgwR3iwu77ry9b3AtMGQ/26QsaMjeD0SbbrfJT5ffMKRgYk8Yp5MflEyWVfI
+                        tTbGHOCSaxyP7QL5hvlQMF+qqI/W6rLdj9PJ6OTH451btgiXPb/pv65Zq3F35BO6
+                        9k89e4vhzUDLeSGGfKqDoDSdhFJqjiHWQecAq6BCChDpdIz/U/S7aSkOi4MKxk5q
+                        kGC16780BusA1PbP9VmH6L18N9bYthe3zaVbYqMYiwIO9YvWWUe28q3OPUkfvSTa
+                        32k/sfrJ0o+irX+aRVDE/CWEu+ltlG9e3iXk/RLt/n2eimTbMrhnPI21D5jgXmh9
+                        zY91qGAJIzbynoNQ0cH6njsRUyfOiz/oVniEpxuoRj+TkXo6KuDIZQ930zli9LcL
+                        YFDRpeiG/ZuZFBXEc7xgyiIa+Q==
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -51,29 +59,37 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
-                        VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
-                        MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
-                        ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
-                        aW5hY2FkZW1pYS5vcmcwHhcNMTQxMDMxMTExMTIzWhcNMjQxMDI4MTExMTIzWjCB
-                        pDELMAkGA1UEBhMCRVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEDAOBgNVBAcMB1V0
-                        cmVjaHQxEzARBgNVBAoMCkluQWNhZGVtaWExHDAaBgNVBAsME1NpZ25pbmcgQ2Vy
-                        dGlmaWNhdGUxFzAVBgNVBAMMDmluYWNhZGVtaWEub3JnMSIwIAYJKoZIhvcNAQkB
-                        FhN0ZWNoQGluYWNhZGVtaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                        CgKCAQEAzGqetfNkkqINY4voyJoSBZ3zKzGcQzC7f9ei9EF2bcBk20YQY8ZTDLY6
-                        BG7TPb0kZQbeFsOLAcup/XZ4+RQiS6WAKmqUQrn7bISn0ayWW3SBO7IBu6mi2Sg0
-                        a+kDyEt/IUL4brUB1Ou5pL9ZYA1sNbfFc+k6PIbphlk4hnoZrdyMymlTXhv00p0S
-                        EaqEBf3kz62yW7dZQNCwmGR6zZMTAEYz5Irrj/99776iqNfOR7upmoeWqD35HkvZ
-                        GiJOzOxHdnabGvlBJrmLrjO4NcHIXcDCoBYfc8jfLprgll/D303f0dG2XhXSowzj
-                        T2vQ4J4EM3Y98Q9s1aqqvzk7A46mIQIDAQABo1AwTjAdBgNVHQ4EFgQUJAE/7/YL
-                        LSZ9qZjnQgiekxqHDwswHwYDVR0jBBgwFoAUJAE/7/YLLSZ9qZjnQgiekxqHDwsw
-                        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV/1tjVGo9EF7rzPwZrTA
-                        aeV/TRshMFlMNyAiElMpQmpkoL79AXP7biNqBJbG5CwpBPwai6PNFkRACKeZT8WT
-                        JsrjNUG9BtKeUxPD45RHAGjZr5UpMe6vNZb12BaUYeCfxlzpOU/7kKK5QvYwFcVY
-                        KL+9MK0bHP0UzkefyyeU+CajYMGJc9fZGWSz3w9vcPAREEVXLc+lmCXT2Y7YoMmX
-                        ZCGGK52oyl1XLxxGngqCUjnNrWfch5JAvq6vF/ci5cIC77ukgZB9FExkC8INwtKC
-                        GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
-                        NA==
+          <ds:X509Certificate>MIIFrzCCA5egAwIBAgIJAJ7He1WDjB6qMA0GCSqGSIb3DQEBCwUAMG4xCzAJBgNV
+                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
+                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
+                        bWlhLm9yZzAeFw0xNzA3MDUxNjIxNDNaFw0yNzA3MDMxNjIxNDNaMG4xCzAJBgNV
+                        BAYTAkVVMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApJbkFjYWRlbWlh
+                        MRwwGgYDVQQLDBNTaWduaW5nIENlcnRpZmljYXRlMRcwFQYDVQQDDA5pbmFjYWRl
+                        bWlhLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5A2uV67ia4
+                        FD5vvzZiNsP5XcdaSxqkDxzf+zC4JfnY+2xRsxdCtznxCc1dfsrT4dbg/xfXfced
+                        Fxz0GcNIXM6eQkxFUztUbIgkKjt8m2wsDHiByiG7b3PtAqh+ZozttDW5cKNMf67c
+                        2qWS6g0/ZqDhGuyEVYpRVmFpKJ56/yGvSle5QLV2u/TEhJCt8z/4/EZdzjEY6ljb
+                        M/LCbfPyJHgiPJZf6+oKvKVQrdixe88/Jy+ISRCGWoCyhs1LHLqs/17nK4huej/w
+                        dmzn/e5Md6OFxnb6sJkNUmb3wCWyi03KJCR4W/I2LX0BKR38yQAf2YKaU2a77UN8
+                        WYTDfgjyW8WbqTpZ85S3l1WKJ2dEiTiIvAfoodSgRye0YVBcZtcleMT+MAmZBKp7
+                        TsBuCS78CZ7kr9BEKkR5c8bvjkCvcUzJK84WAdX2vsazhnF5oUT1QNeNe2LF51OD
+                        VTQOPvDuI3upEJuZtQiHAKHvlApzm68LqtB+QI7YEqisMBu0q5xs8WSMEHakJa0y
+                        cWEQPYaALZP09h06OSuUXWdXDFgJn9APDWEXtjZJq9zD/1E0cMjVm7cGpmAmH/Cv
+                        9CfXL3YzYV25doENWiYP3AibLvs7RueYjr0iWpLZmi15tBgu3c991PkI2zx1n/uD
+                        YHBMzLvjBSr72Tt4QigWMLVQR6PEDMONAgMBAAGjUDBOMB0GA1UdDgQWBBS2ESl6
+                        idHz81HR/aAzMpc+wG+HLzAfBgNVHSMEGDAWgBS2ESl6idHz81HR/aAzMpc+wG+H
+                        LzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAlf6ttaoNN00b8PQS4
+                        qsbuFIa/pxOKIRnchIMXWB1L/+0I5zdupkZ2Uumy6iunfpvNpWjrTY1hLZa+HtOD
+                        Bquxan6QUm4+dmkfg1y0tzseZiKj2ZLy8wxsrLLf+q1EmHHKvuBDsn52OVWBZG/p
+                        BbLT/uCwJaM7AnfIppETpGL4DFCkFspeLY2mgLqfz9fMRLeJRgPyXamS2CuB/bbX
+                        GKCMlFjOKrRb1GNYu79IBNjKxIDnIV4IgqUhkTnRLqxfrexWQU9ANyCX/kexsAeU
+                        pOvzwgwR3iwu77ry9b3AtMGQ/26QsaMjeD0SbbrfJT5ffMKRgYk8Yp5MflEyWVfI
+                        tTbGHOCSaxyP7QL5hvlQMF+qqI/W6rLdj9PJ6OTH451btgiXPb/pv65Zq3F35BO6
+                        9k89e4vhzUDLeSGGfKqDoDSdhFJqjiHWQecAq6BCChDpdIz/U/S7aSkOi4MKxk5q
+                        kGC16780BusA1PbP9VmH6L18N9bYthe3zaVbYqMYiwIO9YvWWUe28q3OPUkfvSTa
+                        32k/sfrJ0o+irX+aRVDE/CWEu+ltlG9e3iXk/RLt/n2eimTbMrhnPI21D5jgXmh9
+                        zY91qGAJIzbynoNQ0cH6njsRUyfOiz/oVniEpxuoRj+TkXo6KuDIZQ930zli9LcL
+                        YFDRpeiG/ZuZFBXEc7xgyiIa+Q==
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>