diff --git a/content/.htaccess b/content/.htaccess index 066d57172..647cbd323 100644 --- a/content/.htaccess +++ b/content/.htaccess @@ -27,9 +27,9 @@ RewriteRule ^U2F/Images/YK5Ci.png$ FIDO/Images/YK5Ci.png [L,R=301] RewriteRule ^U2F/Images/YK5NFC-CNFC.png$ FIDO/Images/YK5NFC-CNFC.png [L,R=301] RewriteRule ^U2F/Images/YKE.png$ FIDO/Images/YKE.png [L,R=301] RewriteRule ^U2F/Images/yubico.png$ FIDO/Images/yubico.png [L,R=301] -RewriteRule ^U2F/fido-preview-ca-cert-2019.pem$ FIDO/fido-preview-ca-cert-2019.pem [L,R=301] -RewriteRule ^U2F/fido-preview-ca-cert-2023.pem$ FIDO/fido-preview-ca-cert-2023.pem [L,R=301] -RewriteRule ^U2F/fido-preview-ca-cert.pem$ FIDO/fido-preview-ca-cert.pem [L,R=301] +RewriteRule ^U2F/fido-preview-ca-cert-2019.pem$ FIDO/yubico-fido-preview-ca-certs.pem [L,R=301] +RewriteRule ^U2F/fido-preview-ca-cert-2023.pem$ FIDO/yubico-fido-preview-ca-certs.pem [L,R=301] +RewriteRule ^U2F/fido-preview-ca-cert.pem$ FIDO/yubico-fido-preview-ca-certs.pem [L,R=301] RewriteRule ^U2F/yubico-metadata.json$ FIDO/yubico-metadata.json [L,R=301] RewriteRule ^U2F/yubico-u2f-ca-1.pem$ FIDO/yubico-fido-ca-1.pem [L,R=301] RewriteRule ^U2F/yubico-u2f-ca-certs.txt$ FIDO/yubico-fido-ca-certs.txt [L,R=301] diff --git a/content/U2F/Attestation_and_Metadata/index.adoc b/content/U2F/Attestation_and_Metadata/index.adoc index bceff6077..36f6e17a0 100644 --- a/content/U2F/Attestation_and_Metadata/index.adoc +++ b/content/U2F/Attestation_and_Metadata/index.adoc @@ -15,7 +15,7 @@ validated. In Yubico's case, all our attestation certificates are signed by link:/FIDO/yubico-fido-ca-certs.txt[our root CA]. The same attestation certificate is used for both U2F and WebAuthn. NOTE: If you have a YubiKey Preview device, the attestation certificate will -instead be signed by our link:/FIDO/fido-preview-ca-cert-2023.pem[2023Yubico FIDO Preview CA] or link:/FIDO/fido-preview-ca-cert.pem[Yubico FIDO Preview CA (prior to 2023)]. +instead be signed by one of our link:/FIDO/yubico-fido-preview-ca-certs.pem[FIDO Preview CAs]. === Yubico's metadata format diff --git a/static/FIDO/fido-preview-ca-cert-2019.pem b/static/FIDO/fido-preview-ca-cert-2019.pem deleted file mode 100644 index 8c6bf0320..000000000 --- a/static/FIDO/fido-preview-ca-cert-2019.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDGDCCAgCgAwIBAgIJAOklWRaQTVDkMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV -BAMMFll1YmljbyBGSURPIFByZXZpZXcgQ0EwHhcNMTkwMjE4MTIxMzA4WhcNMjAw -MjE4MTIxMzA4WjAhMR8wHQYDVQQDDBZZdWJpY28gRklETyBQcmV2aWV3IENBMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnvKl/0EJyrD0nmaiU2VZrJl1 -EcJgBUrmzD4htni4ndcMJ4kXd0YMVoXZfBb684yghChJMTyJECcSE2qcdH1qZ8Cb -+yGDpxUtghzHWCQ63I1/Q3MeX1GmF6YhqxL5cVeY93a0EbXU8S7HU5ttzKVc+wh0 -ufx6KqmwYUWOV38E28GQyWSKimdB15XG6ASen5GRa5opPdg+NORORuC7tVL80TbV -KvQs2yYKJt0Pp5ZB2hEBS9QS0AuJgitQtEA96yzUSAib0unMRXhvK7reMTA+dVFZ -e5is2HaKe55OQY+TlEkfUJF697HAT4oUFfyyG9uebi4WWqdFtfijaeyu1Mi3OwID -AQABo1MwUTAdBgNVHQ4EFgQUEigaujrPSYpIIPDJc/HrqhEpG0swHwYDVR0jBBgw -FoAUEigaujrPSYpIIPDJc/HrqhEpG0swDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG -9w0BAQsFAAOCAQEAYKOQsm46ysWVP/iv4Xj5EnHuQizOhPgmp9REoKVg/i4lhaqY -293WzUsyRIdWVEFCpNWT3dTeaWm99n62bUSb0JtqU4+SGeMau3B7GiShmRbN7lLx -z/By7KPqICYncLrKLukUCu6S6g4U6sPbDZRcxm8LYhR9DTxHuSxyb3gthFhxptBj -Riceh8yGw4Ic649quLwqZ6dzgcEe9YqiWkLtAhrNWjxGRIayi3fuMGewCRfnHb0K -bdRpjYMJSczrN5Wu5Dx+HIagOHLXsY6xbyh8bOimeoeQDbOpsUffILTXKs57QoHF -tuCnuu0rEp9SIguG51IrUokbMFnUxMdfEkXrgA== ------END CERTIFICATE----- diff --git a/static/FIDO/fido-preview-ca-cert-2023.pem b/static/FIDO/fido-preview-ca-cert-2023.pem deleted file mode 100644 index a48fe804d..000000000 --- a/static/FIDO/fido-preview-ca-cert-2023.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDKjCCAhKgAwIBAgIUef+VvHkcTQnED++wJM/IxzSULk0wDQYJKoZIhvcNAQEL -BQAwJjEkMCIGA1UEAwwbWXViaWNvIDIwMjMgRklETyBQcmV2aWV3IENBMB4XDTIz -MDkyNTExMzI0MVoXDTI0MTIzMTExMzI0MVowJjEkMCIGA1UEAwwbWXViaWNvIDIw -MjMgRklETyBQcmV2aWV3IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAouFMTOKaE0YtexOoisSxp+Ebi5IA4esEScx16lzQdqV6/eZ82KtJeNXEuNkB -VZDpc32gStuxLBH8mgsoHBFai2DkjfBn5qbwR/c5+snlwZvjgVA0hzKw9CwAeAwR -D5krWt88/CVyCkMcgLSGwZs/rj7F/Ls3Ebg7MqLbbQJ9CozbbLdJUYIHcPpSZPto -MrZb4Gvni6iVS9UvCKgpqc6LGRmoYGG4ZR3lGJ/XQZfu+GeJW67iimMj/yoXOwxu -cxivZHFk6cQSgwuwioeNm4wvk83LhSuWctf2kAyQcZ7kUnpNee+d4MgrmGU4XMFL -iTgutaB+e9V8d5JTkUOHiLztkQIDAQABo1AwTjAdBgNVHQ4EFgQUM5SB5bHrV+jp -IOMdJl7u7bcnTY8wHwYDVR0jBBgwFoAUM5SB5bHrV+jpIOMdJl7u7bcnTY8wDAYD -VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEACowR3KTLfidJyQFNqEFfUrfZ -9aa9egpOQtNRJdLStJ6xu2WfLwvG4ojGJlBKNnfa5DIcyQYf/8qJ4eliAVeNXuYm -eMmgNgZZyuY6G1yWCD2V3sD6Z4uj3SbaDOHj3gHvszgQhrhT1h/puHQkn6+hYKAp -77kM7Ic6AZ/RFbjpmLLk2D0sE1lzT/02i+Bh7M8smaiDZ9++JGzxeSun8W1HleZU -m2qKGmRa4XPdryT7x6KGUGnU4a3bpUmVeY9rQ/sfMd5ZToo+3unFWDzoVV2vNu8+ -+VLC9zo40FaKQLr9VAJDJ4yLENR7KrmV8L0cCXKJGZWAWtG5RGTmHIhd+nB41g== ------END CERTIFICATE----- diff --git a/static/FIDO/fido-preview-ca-cert.pem b/static/FIDO/fido-preview-ca-cert.pem deleted file mode 100644 index 1e4f9c68a..000000000 --- a/static/FIDO/fido-preview-ca-cert.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDHzCCAgegAwIBAgIJANpqD52TOTusMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV -BAMMG1l1YmljbyBGSURPIFByZXZpZXcgQ0EgMjAyMDAeFw0yMDA4MzExODE3MTFa -Fw0yMTEyMzExODE3MTFaMCYxJDAiBgNVBAMMG1l1YmljbyBGSURPIFByZXZpZXcg -Q0EgMjAyMDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOGBLtBmUPJQ -ACQWVEeBxezRgZdqGMP6eTrPty8yvM9xA+j/X4g2lRNMF9a0jw3BjkWSsoWJjYTu -zevGMg2rb9M5qqd/OD498OAk6UEtMybr162CO2wB8Sn2nzfzUdbwZT4dxl251lfX -5JsZVTyJduhlJzbKGetL3JMmCApetSO0xccGSIV9GUoJm78KlQO6smSDAkRFxJ8P -g8bE449qiIqP/K10uReu66UCWdaoXCKqRd5ikbU+6igJFHZz94UBPrsglcY0Fq03 -nrBBvrpEzGnisB/43E9Itjr9ULV4PQQmiuWMcIPmFP1jTNgKKnXZsxe114B/zB3U -xhIB29rRopECAwEAAaNQME4wHQYDVR0OBBYEFALvouKDUnhjGxURR+M1K1mMiBt7 -MB8GA1UdIwQYMBaAFALvouKDUnhjGxURR+M1K1mMiBt7MAwGA1UdEwQFMAMBAf8w -DQYJKoZIhvcNAQELBQADggEBAEO48A+c+1Eac7ZYJvBs3jA40qVhEKeEy2i+JiAf -wuGzcfMUk/4oCZ5V5WDLzGhaScbMLEoVMqxHFUFXI1kU9PNVonygwY0xVs3mNqlC -JM+LZ2QtxGqCrDGxMPAluvsFhr1mMaHk7eCzkJAhhpvUaG9F07jmo5U7HfFyQr0w -QxSiUg5nmjXFgkcui2pMfOeKBddBy7Oc6uheCRyPzOKdYekgbZPrNZ/2OnhJqQ/6 -Sq9Khz6h99AmUpMYUiua0mzFoSnFkyERL0S4h/bbZlSEeCiJCxFEDBZB4ZgOsORL -2DHLjkTnePgs9bjVp3lVelIplqi+K6O+MmMlYFrOOewa5a4= ------END CERTIFICATE----- diff --git a/static/FIDO/yubico-fido-preview-ca-certs.pem b/static/FIDO/yubico-fido-preview-ca-certs.pem new file mode 100644 index 000000000..32714cfb0 --- /dev/null +++ b/static/FIDO/yubico-fido-preview-ca-certs.pem @@ -0,0 +1,57 @@ +-----BEGIN CERTIFICATE----- +MIIDGDCCAgCgAwIBAgIJAOklWRaQTVDkMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV +BAMMFll1YmljbyBGSURPIFByZXZpZXcgQ0EwHhcNMTkwMjE4MTIxMzA4WhcNMjAw +MjE4MTIxMzA4WjAhMR8wHQYDVQQDDBZZdWJpY28gRklETyBQcmV2aWV3IENBMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnvKl/0EJyrD0nmaiU2VZrJl1 +EcJgBUrmzD4htni4ndcMJ4kXd0YMVoXZfBb684yghChJMTyJECcSE2qcdH1qZ8Cb ++yGDpxUtghzHWCQ63I1/Q3MeX1GmF6YhqxL5cVeY93a0EbXU8S7HU5ttzKVc+wh0 +ufx6KqmwYUWOV38E28GQyWSKimdB15XG6ASen5GRa5opPdg+NORORuC7tVL80TbV +KvQs2yYKJt0Pp5ZB2hEBS9QS0AuJgitQtEA96yzUSAib0unMRXhvK7reMTA+dVFZ +e5is2HaKe55OQY+TlEkfUJF697HAT4oUFfyyG9uebi4WWqdFtfijaeyu1Mi3OwID +AQABo1MwUTAdBgNVHQ4EFgQUEigaujrPSYpIIPDJc/HrqhEpG0swHwYDVR0jBBgw +FoAUEigaujrPSYpIIPDJc/HrqhEpG0swDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG +9w0BAQsFAAOCAQEAYKOQsm46ysWVP/iv4Xj5EnHuQizOhPgmp9REoKVg/i4lhaqY +293WzUsyRIdWVEFCpNWT3dTeaWm99n62bUSb0JtqU4+SGeMau3B7GiShmRbN7lLx +z/By7KPqICYncLrKLukUCu6S6g4U6sPbDZRcxm8LYhR9DTxHuSxyb3gthFhxptBj +Riceh8yGw4Ic649quLwqZ6dzgcEe9YqiWkLtAhrNWjxGRIayi3fuMGewCRfnHb0K +bdRpjYMJSczrN5Wu5Dx+HIagOHLXsY6xbyh8bOimeoeQDbOpsUffILTXKs57QoHF +tuCnuu0rEp9SIguG51IrUokbMFnUxMdfEkXrgA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDHzCCAgegAwIBAgIJANpqD52TOTusMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV +BAMMG1l1YmljbyBGSURPIFByZXZpZXcgQ0EgMjAyMDAeFw0yMDA4MzExODE3MTFa +Fw0yMTEyMzExODE3MTFaMCYxJDAiBgNVBAMMG1l1YmljbyBGSURPIFByZXZpZXcg +Q0EgMjAyMDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOGBLtBmUPJQ +ACQWVEeBxezRgZdqGMP6eTrPty8yvM9xA+j/X4g2lRNMF9a0jw3BjkWSsoWJjYTu +zevGMg2rb9M5qqd/OD498OAk6UEtMybr162CO2wB8Sn2nzfzUdbwZT4dxl251lfX +5JsZVTyJduhlJzbKGetL3JMmCApetSO0xccGSIV9GUoJm78KlQO6smSDAkRFxJ8P +g8bE449qiIqP/K10uReu66UCWdaoXCKqRd5ikbU+6igJFHZz94UBPrsglcY0Fq03 +nrBBvrpEzGnisB/43E9Itjr9ULV4PQQmiuWMcIPmFP1jTNgKKnXZsxe114B/zB3U +xhIB29rRopECAwEAAaNQME4wHQYDVR0OBBYEFALvouKDUnhjGxURR+M1K1mMiBt7 +MB8GA1UdIwQYMBaAFALvouKDUnhjGxURR+M1K1mMiBt7MAwGA1UdEwQFMAMBAf8w +DQYJKoZIhvcNAQELBQADggEBAEO48A+c+1Eac7ZYJvBs3jA40qVhEKeEy2i+JiAf +wuGzcfMUk/4oCZ5V5WDLzGhaScbMLEoVMqxHFUFXI1kU9PNVonygwY0xVs3mNqlC +JM+LZ2QtxGqCrDGxMPAluvsFhr1mMaHk7eCzkJAhhpvUaG9F07jmo5U7HfFyQr0w +QxSiUg5nmjXFgkcui2pMfOeKBddBy7Oc6uheCRyPzOKdYekgbZPrNZ/2OnhJqQ/6 +Sq9Khz6h99AmUpMYUiua0mzFoSnFkyERL0S4h/bbZlSEeCiJCxFEDBZB4ZgOsORL +2DHLjkTnePgs9bjVp3lVelIplqi+K6O+MmMlYFrOOewa5a4= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDKjCCAhKgAwIBAgIUef+VvHkcTQnED++wJM/IxzSULk0wDQYJKoZIhvcNAQEL +BQAwJjEkMCIGA1UEAwwbWXViaWNvIDIwMjMgRklETyBQcmV2aWV3IENBMB4XDTIz +MDkyNTExMzI0MVoXDTI0MTIzMTExMzI0MVowJjEkMCIGA1UEAwwbWXViaWNvIDIw +MjMgRklETyBQcmV2aWV3IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAouFMTOKaE0YtexOoisSxp+Ebi5IA4esEScx16lzQdqV6/eZ82KtJeNXEuNkB +VZDpc32gStuxLBH8mgsoHBFai2DkjfBn5qbwR/c5+snlwZvjgVA0hzKw9CwAeAwR +D5krWt88/CVyCkMcgLSGwZs/rj7F/Ls3Ebg7MqLbbQJ9CozbbLdJUYIHcPpSZPto +MrZb4Gvni6iVS9UvCKgpqc6LGRmoYGG4ZR3lGJ/XQZfu+GeJW67iimMj/yoXOwxu +cxivZHFk6cQSgwuwioeNm4wvk83LhSuWctf2kAyQcZ7kUnpNee+d4MgrmGU4XMFL +iTgutaB+e9V8d5JTkUOHiLztkQIDAQABo1AwTjAdBgNVHQ4EFgQUM5SB5bHrV+jp +IOMdJl7u7bcnTY8wHwYDVR0jBBgwFoAUM5SB5bHrV+jpIOMdJl7u7bcnTY8wDAYD +VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEACowR3KTLfidJyQFNqEFfUrfZ +9aa9egpOQtNRJdLStJ6xu2WfLwvG4ojGJlBKNnfa5DIcyQYf/8qJ4eliAVeNXuYm +eMmgNgZZyuY6G1yWCD2V3sD6Z4uj3SbaDOHj3gHvszgQhrhT1h/puHQkn6+hYKAp +77kM7Ic6AZ/RFbjpmLLk2D0sE1lzT/02i+Bh7M8smaiDZ9++JGzxeSun8W1HleZU +m2qKGmRa4XPdryT7x6KGUGnU4a3bpUmVeY9rQ/sfMd5ZToo+3unFWDzoVV2vNu8+ ++VLC9zo40FaKQLr9VAJDJ4yLENR7KrmV8L0cCXKJGZWAWtG5RGTmHIhd+nB41g== +-----END CERTIFICATE----- diff --git a/static/FIDO/yubico-fido-preview-ca-certs.pem.sig b/static/FIDO/yubico-fido-preview-ca-certs.pem.sig new file mode 100644 index 000000000..731c6ddd4 Binary files /dev/null and b/static/FIDO/yubico-fido-preview-ca-certs.pem.sig differ