diff --git a/.gitattributes b/.gitattributes index 700825a7..83d35b02 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,6 @@ *.nupkg binary *.pdf binary *.snk binary + +# Ensure key files have LF endings for easier usage with ssh-keygen +test/Data/* eol=lf \ No newline at end of file diff --git a/test/Data/Key.ECDSA.Encrypted.txt b/test/Data/Key.ECDSA.Encrypted.txt index f0af5ba7..405b4105 100644 --- a/test/Data/Key.ECDSA.Encrypted.txt +++ b/test/Data/Key.ECDSA.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN EC PRIVATE KEY----- +-----BEGIN EC PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-128-CBC,54D46F498C989115AAE14FEA21E3AF11 diff --git a/test/Data/Key.ECDSA.txt b/test/Data/Key.ECDSA.txt index 13ac9fb4..3c1c9ed8 100644 --- a/test/Data/Key.ECDSA.txt +++ b/test/Data/Key.ECDSA.txt @@ -1,4 +1,4 @@ ------BEGIN EC PRIVATE KEY----- +-----BEGIN EC PRIVATE KEY----- MHcCAQEEIEdqaFKgJBIibVjyUh1v7Y35LwIQJrocdTaYFLwl7iB0oAoGCCqGSM49 AwEHoUQDQgAEQD5MO/n9yqSDTszwzVpApLx5SQFecE5ZfDkgxqVdHQecm1BAPozZ 4eKGNhKn72hT79mLlp9HXX+oNEcuVT83Hw== diff --git a/test/Data/Key.ECDSA384.Encrypted.txt b/test/Data/Key.ECDSA384.Encrypted.txt index 00072ce2..c0e1a360 100644 --- a/test/Data/Key.ECDSA384.Encrypted.txt +++ b/test/Data/Key.ECDSA384.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN EC PRIVATE KEY----- +-----BEGIN EC PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-128-CBC,1D64653C5E18C2AACB0B17E3FE43C219 diff --git a/test/Data/Key.ECDSA384.txt b/test/Data/Key.ECDSA384.txt index f2d658ea..43edbf09 100644 --- a/test/Data/Key.ECDSA384.txt +++ b/test/Data/Key.ECDSA384.txt @@ -1,4 +1,4 @@ ------BEGIN EC PRIVATE KEY----- +-----BEGIN EC PRIVATE KEY----- MIGkAgEBBDCQawHdHLR7NvKa2vPV0sVkbzOE8c0enp95iEysGcGV66RXE1EH//nh gu5UzeTR4KigBwYFK4EEACKhZANiAAQUk4rVvoOPI1hQzWpNx09Uo6qG+srGcbvB q15eFK0GnK/T0UBKxdbZ2+//KAYI6SeDHM9t3ORF1aX5EpjTEBI4d7ZY/lV9jX6M diff --git a/test/Data/Key.ECDSA521.Encrypted.txt b/test/Data/Key.ECDSA521.Encrypted.txt index 381b30be..79b33907 100644 --- a/test/Data/Key.ECDSA521.Encrypted.txt +++ b/test/Data/Key.ECDSA521.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN EC PRIVATE KEY----- +-----BEGIN EC PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-128-CBC,F995028237EBD79C928530CC6C3E957F diff --git a/test/Data/Key.ECDSA521.txt b/test/Data/Key.ECDSA521.txt index 31abe917..27a74ff9 100644 --- a/test/Data/Key.ECDSA521.txt +++ b/test/Data/Key.ECDSA521.txt @@ -1,4 +1,4 @@ ------BEGIN EC PRIVATE KEY----- +-----BEGIN EC PRIVATE KEY----- MIHcAgEBBEIBn2DAme7AU8sCA+/sd6s3c2FNW26IiPvulGd3FC8k5q+fjBZ5LUWR iJMGrsf2rJLO8hXMGJYoF9tjZEGaabQ8KVagBwYFK4EEACOhgYkDgYYABABrpVjs ANqcvqMUo1wo0I1uVCXQ6xrauy4iU86FiOwFmkYRrle4w3oYdRJwniC3TwGMuBuM diff --git a/test/Data/Key.OPENSSH.ECDSA.Encrypted.txt b/test/Data/Key.OPENSSH.ECDSA.Encrypted.txt index ab76db4a..2de37354 100644 --- a/test/Data/Key.OPENSSH.ECDSA.Encrypted.txt +++ b/test/Data/Key.OPENSSH.ECDSA.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCPSPglZ3 w/7DmCJxYohONLAAAAEAAAAAEAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlz dHAyNTYAAABBBK6YY2NwwLDSMnJTD+a4OfitCDuG/MnY/AstPgh54xMrZF6Qr0U1H6kRMK diff --git a/test/Data/Key.OPENSSH.ECDSA.txt b/test/Data/Key.OPENSSH.ECDSA.txt index 94f16bcb..c27521b4 100644 --- a/test/Data/Key.OPENSSH.ECDSA.txt +++ b/test/Data/Key.OPENSSH.ECDSA.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS 1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQSP3ZTb37LFvSmKweu03A5s/cwcw3+3 jL1LqQK6D929xY1J2J6S91LXOBpBfz4l+8Ng7sWhu9P/hF/wmB2QRygrAAAAqMq583bKuf diff --git a/test/Data/Key.OPENSSH.ECDSA384.Encrypted.txt b/test/Data/Key.OPENSSH.ECDSA384.Encrypted.txt index 50065450..636ed56a 100644 --- a/test/Data/Key.OPENSSH.ECDSA384.Encrypted.txt +++ b/test/Data/Key.OPENSSH.ECDSA384.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAMZphcrt UKJMlSabtzt2GdAAAAEAAAAAEAAACIAAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlz dHAzODQAAABhBFL5NEL9uRhgkF2q+8m58EvtZq4mDGgcVEzafPRuNIn1018m9KuqNpOQ6d diff --git a/test/Data/Key.OPENSSH.ECDSA384.txt b/test/Data/Key.OPENSSH.ECDSA384.txt index e5e6e06a..5c30b228 100644 --- a/test/Data/Key.OPENSSH.ECDSA384.txt +++ b/test/Data/Key.OPENSSH.ECDSA384.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAiAAAABNlY2RzYS 1zaGEyLW5pc3RwMzg0AAAACG5pc3RwMzg0AAAAYQRTP1DMXoHgW+RX+S/NxUEElou1cmLD 6CEiR+zpzaGG6mzl6LhUY+Z3f2M3u4u7tcM8TgB/jiHbnI9TaeN5QK4HX1D9DXkH5RhfnL diff --git a/test/Data/Key.OPENSSH.ECDSA521.Encrypted.txt b/test/Data/Key.OPENSSH.ECDSA521.Encrypted.txt index da831cf9..8c78b5a6 100644 --- a/test/Data/Key.OPENSSH.ECDSA521.Encrypted.txt +++ b/test/Data/Key.OPENSSH.ECDSA521.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABBWjIyzbM MQ3UPE8BiQ0n4LAAAAEAAAAAEAAACsAAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlz dHA1MjEAAACFBAH9BVM6bRhbELtgdMGsin5lM42R2EWoT+6Akakl5rQy2tHHLIYGLEfaqI diff --git a/test/Data/Key.OPENSSH.ECDSA521.txt b/test/Data/Key.OPENSSH.ECDSA521.txt index 0ad09eb2..96ab26a5 100644 --- a/test/Data/Key.OPENSSH.ECDSA521.txt +++ b/test/Data/Key.OPENSSH.ECDSA521.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAArAAAABNlY2RzYS 1zaGEyLW5pc3RwNTIxAAAACG5pc3RwNTIxAAAAhQQAa7p4WVga+08qu160BrdzKyRNJMQC eGhFluNdq73/uaW3qlqoEiaNtc5uB7HHyjCWQTmfzrSRLRZ7YBwUancwyh4Aq6gBgGsXVz diff --git a/test/Data/Key.OPENSSH.ED25519.Encrypted.txt b/test/Data/Key.OPENSSH.ED25519.Encrypted.txt index 50b4d968..7fd7bad8 100644 --- a/test/Data/Key.OPENSSH.ED25519.Encrypted.txt +++ b/test/Data/Key.OPENSSH.ED25519.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABBg HWh+J0IG6OfYxD74SoT9AAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIGFd yflleGqSPOhgSYZf7ZQFlG0zEL9VDGC69UbtaaByAAAAoDLm8u8wFwlqjzZRfVxj diff --git a/test/Data/Key.OPENSSH.ED25519.txt b/test/Data/Key.OPENSSH.ED25519.txt index 84811f65..488da8b5 100644 --- a/test/Data/Key.OPENSSH.ED25519.txt +++ b/test/Data/Key.OPENSSH.ED25519.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtz c2gtZWQyNTUxOQAAACANCWZw0K8UGXDQC32WBuyzwFtTGBBr1VuZ43uzpTBjIgAA AKBATgCiQE4AogAAAAtzc2gtZWQyNTUxOQAAACANCWZw0K8UGXDQC32WBuyzwFtT diff --git a/test/Data/Key.OPENSSH.RSA.Encrypted.txt b/test/Data/Key.OPENSSH.RSA.Encrypted.txt index b9eed58b..05f7a440 100644 --- a/test/Data/Key.OPENSSH.RSA.Encrypted.txt +++ b/test/Data/Key.OPENSSH.RSA.Encrypted.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCoWhCSaG psKT80oPIOAlqJAAAAEAAAAAEAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQCxOfnmxC1g mmX18LCBG/X73BoCXQEBEAJz3V9w0FMTgUBebK3fkfOMLNzWn5aMR608wQHOEPYhHffCJf diff --git a/test/Data/Key.OPENSSH.RSA.txt b/test/Data/Key.OPENSSH.RSA.txt index 893001eb..9586730e 100644 --- a/test/Data/Key.OPENSSH.RSA.txt +++ b/test/Data/Key.OPENSSH.RSA.txt @@ -1,4 +1,4 @@ ------BEGIN OPENSSH PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn NhAAAAAwEAAQAAAQEA7W7Oigi7Hj1msa2l8HimLPzagVmE/CseMKCRxPMTtWTvoZdMt7hf kthWA7h20a7oSSeH2t7FqeOpVNGFYvRV3BVWsKZJMRcdJiTCZAjH38rYk90XvZ3mKrKN/3 diff --git a/test/Data/Key.RSA.Encrypted.Aes.128.CBC.12345.txt b/test/Data/Key.RSA.Encrypted.Aes.128.CBC.12345.txt index cc017a90..c86a0572 100644 --- a/test/Data/Key.RSA.Encrypted.Aes.128.CBC.12345.txt +++ b/test/Data/Key.RSA.Encrypted.Aes.128.CBC.12345.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-128-CBC,AD7A2024C208E41F91C191B89AB9515A diff --git a/test/Data/Key.RSA.Encrypted.Aes.192.CBC.12345.txt b/test/Data/Key.RSA.Encrypted.Aes.192.CBC.12345.txt index 51e90210..41945ff2 100644 --- a/test/Data/Key.RSA.Encrypted.Aes.192.CBC.12345.txt +++ b/test/Data/Key.RSA.Encrypted.Aes.192.CBC.12345.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-192-CBC,0E34605476FC4C57886CE6350CD6F61E diff --git a/test/Data/Key.RSA.Encrypted.Aes.256.CBC.12345.txt b/test/Data/Key.RSA.Encrypted.Aes.256.CBC.12345.txt index cb31e913..a26bdef3 100644 --- a/test/Data/Key.RSA.Encrypted.Aes.256.CBC.12345.txt +++ b/test/Data/Key.RSA.Encrypted.Aes.256.CBC.12345.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-256-CBC,063DE67AE11456C89BCE9D4A21BE3DFB diff --git a/test/Data/Key.RSA.Encrypted.Des.CBC.12345.txt b/test/Data/Key.RSA.Encrypted.Des.CBC.12345.txt index 32734a07..9ce0163d 100644 --- a/test/Data/Key.RSA.Encrypted.Des.CBC.12345.txt +++ b/test/Data/Key.RSA.Encrypted.Des.CBC.12345.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: DES-CBC,BD35E157CDD07CAD diff --git a/test/Data/Key.RSA.Encrypted.Des.Ede3.CBC.12345.txt b/test/Data/Key.RSA.Encrypted.Des.Ede3.CBC.12345.txt index aa9250a6..a0f4b0e7 100644 --- a/test/Data/Key.RSA.Encrypted.Des.Ede3.CBC.12345.txt +++ b/test/Data/Key.RSA.Encrypted.Des.Ede3.CBC.12345.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: DES-EDE3-CBC,AF373EFF708479DF diff --git a/test/Data/Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt b/test/Data/Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt index 066d39fb..8021cda6 100644 --- a/test/Data/Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt +++ b/test/Data/Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: DES-EDE3-CFB,81C75CC63A21DFFB diff --git a/test/Data/Key.RSA.txt b/test/Data/Key.RSA.txt index cf2cc979..76971dfe 100644 --- a/test/Data/Key.RSA.txt +++ b/test/Data/Key.RSA.txt @@ -1,4 +1,4 @@ ------BEGIN RSA PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- MIIEoQIBAAKCAQEAuTtXn+BatX1oJuvhqfJZw5jc/pcIxJUPmuoFCH3+bXfKBJ/9 4ixNETzZBasyvT/ozboAbCG3qcJOYxf2BEeTAIXe1jLAoTd1GKCwMvZOyjnsPN95 /lChwfdnBbMzpZYTGfoUylXme/mzjjLu/J0qXgR5lyk9HFT+x5YEtRl8VSHiDkLK diff --git a/test/Data/Key.SSH2.RSA.Encrypted.Des.CBC.12345.txt b/test/Data/Key.SSH2.RSA.Encrypted.Des.CBC.12345.txt index 2a81a23d..952b012f 100644 --- a/test/Data/Key.SSH2.RSA.Encrypted.Des.CBC.12345.txt +++ b/test/Data/Key.SSH2.RSA.Encrypted.Des.CBC.12345.txt @@ -1,4 +1,4 @@ ----- BEGIN SSH2 ENCRYPTED PRIVATE KEY ---- +---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ---- Comment: "imported-openssh-key" P2/56wAAA/MAAAA3aWYtbW9kbntzaWdue3JzYS1wa2NzMS1zaGExfSxlbmNyeXB0e3JzYS 1wa2NzMXYyLW9hZXB9fQAAAAgzZGVzLWNiYwAAA6A6Wt6IR5cz0PCsSJDOjcs3MdQscfdN diff --git a/test/Data/Key.SSH2.RSA.txt b/test/Data/Key.SSH2.RSA.txt index 04f9a3ce..2de7f0f8 100644 --- a/test/Data/Key.SSH2.RSA.txt +++ b/test/Data/Key.SSH2.RSA.txt @@ -1,4 +1,4 @@ ----- BEGIN SSH2 ENCRYPTED PRIVATE KEY ---- +---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ---- Comment: "imported-openssh-key" P2/56wAAA+4AAAA3aWYtbW9kbntzaWdue3JzYS1wa2NzMS1zaGExfSxlbmNyeXB0e3JzYS 1wa2NzMXYyLW9hZXB9fQAAAARub25lAAADnwAAA5sAAAARAQABAAAIAJoF62h2fdR02ncN