putty-key 1.0.1 → 1.1.0

data/test/fixtures/test-invalid-argon2-memory.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2id
+Argon2-Memory: -1
+Argon2-Passes: 8
+Argon2-Parallelism: 1
+Argon2-Salt: 7d5d4557c5563a5b5009e1452c518e04
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-argon2-parallelism-maximum.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: 8
+Argon2-Parallelism: 4294967297
+Argon2-Salt: 7d5d4557c5563a5b5009e1452c518e04
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-argon2-parallelism.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: 8
+Argon2-Parallelism: -1
+Argon2-Salt: 7d5d4557c5563a5b5009e1452c518e04
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-argon2-passes-maximum.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: 4294967297
+Argon2-Parallelism: 1
+Argon2-Salt: 7d5d4557c5563a5b5009e1452c518e04
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-argon2-passes.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: -1
+Argon2-Parallelism: 1
+Argon2-Salt: 7d5d4557c5563a5b5009e1452c518e04
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-argon2-salt.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2id
+Argon2-Memory: 8192
+Argon2-Passes: 8
+Argon2-Parallelism: 1
+Argon2-Salt: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-blob-lines.ppk

@@ -1,11 +1,11 @@
-PuTTY-User-Key-File-2: test
-Encryption: none
-Comment: This is a test ppk file
-Public-Lines: -2
-AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
-aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
-Private-Lines: 3
-AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
-YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
-b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
-Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb
+PuTTY-User-Key-File-2: test
+Encryption: none
+Comment: This is a test ppk file
+Public-Lines: -2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
+YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
+b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
+Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb

data/test/fixtures/test-invalid-encryption-type.ppk

@@ -1,11 +1,11 @@
-PuTTY-User-Key-File-2: test
-Encryption: camellia256-cbc
-Comment: This is a test ppk file
-Public-Lines: 2
-AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
-aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
-Private-Lines: 3
-O4jfhfwamnLbbSs/DxTd+nZNFRcBC2XuPBD8VbSRNmLpx57FGVPiLvgYH5Ot8zhb
-+90J6pY2hO6M2bQsQNoqMwDB0K/0bSG3ignWN4XKXJOofpmn2o8gBv7xfmJ++2Ni
-qAdfPt1qZXIb7Yp4weFQiAWJ6m0ysDIS7Xnwv/uZLRc=
-Private-MAC: 435b5081a0f34cee896e0783db15e9e832a9de31
+PuTTY-User-Key-File-2: test
+Encryption: camellia256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+O4jfhfwamnLbbSs/DxTd+nZNFRcBC2XuPBD8VbSRNmLpx57FGVPiLvgYH5Ot8zhb
++90J6pY2hO6M2bQsQNoqMwDB0K/0bSG3ignWN4XKXJOofpmn2o8gBv7xfmJ++2Ni
+qAdfPt1qZXIb7Yp4weFQiAWJ6m0ysDIS7Xnwv/uZLRc=
+Private-MAC: 435b5081a0f34cee896e0783db15e9e832a9de31

data/test/fixtures/test-invalid-format-1.ppk

@@ -1,11 +1,11 @@
-PuTTY-User-Key-File-1: test
-Encryption: none
-Comment: This is a test ppk file
-Public-Lines: 2
-AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
-aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
-Private-Lines: 3
-AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
-YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
-b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
-Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb
+PuTTY-User-Key-File-1: test
+Encryption: none
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
+YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
+b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
+Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb

data/test/fixtures/{test-invalid-format-3.ppk → test-invalid-format-4.ppk}

@@ -1,11 +1,11 @@
-PuTTY-User-Key-File-3: test
-Encryption: none
-Comment: This is a test ppk file
-Public-Lines: 2
-AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
-aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
-Private-Lines: 3
-AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
-YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
-b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
-Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb
+PuTTY-User-Key-File-4: test
+Encryption: none
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
+YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
+b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
+Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb

data/test/fixtures/test-invalid-key-derivation.ppk

@@ -0,0 +1,16 @@
+PuTTY-User-Key-File-3: test
+Encryption: aes256-cbc
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Key-Derivation: Argon2x
+Argon2-Memory: 8192
+Argon2-Passes: 8
+Argon2-Parallelism: 1
+Argon2-Salt: 7d5d4557c5563a5b5009e1452c518e04
+Private-Lines: 3
+sdvJ5Ayw1iLf2fMiWnybD27Ms6uPJTtBPhGvfCsk3IX9i9QJ4kItn6lzVndmgWi3
+aCH2aS4YL+MjYYc4PWXQfN+3PJ8NVVdtopPTr3qplc0hDeURz8Y0pyr1zIneTLeJ
+0DHmIlqiI2v8N54RGaatxi0H9EYWbjCGG/SiRjjOM/EcaJ8rngXXhkQHbV2L7kxO
+Private-MAC: 5f6f45b0576b1d8be8af871873d66ff4d59d9eeef05459176e521ebcb931c0ea

data/test/fixtures/test-invalid-private-mac.ppk

@@ -1,11 +1,11 @@
-PuTTY-User-Key-File-2: test
-Encryption: none
-Comment: This is a test ppk file
-Public-Lines: 2
-AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
-aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
-Private-Lines: 3
-AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
-YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
-b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
-Private-MAC: a89e0b76bb00232fd21871875bcd319cff3116ea
+PuTTY-User-Key-File-2: test
+Encryption: none
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
+YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
+b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
+Private-MAC: a89e0b76bb00232fd21871875bcd319cff3116ea

data/test/fixtures/test-legacy-mac-line-endings.ppk

@@ -0,0 +1 @@
+PuTTY-User-Key-File-2: test

data/test/fixtures/test-missing-final-line-ending.ppk

@@ -0,0 +1,11 @@
+PuTTY-User-Key-File-2: test
+Encryption: none
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
+YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
+b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
+Private-MAC: f3045e1abe1fd459117eec9d0eed18661b4274bb

data/test/fixtures/test-truncated.ppk

@@ -1,10 +1,10 @@
-PuTTY-User-Key-File-2: test
-Encryption: none
-Comment: This is a test ppk file
-Public-Lines: 2
-AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
-aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
-Private-Lines: 3
-AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
-YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
-b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu
+PuTTY-User-Key-File-2: test
+Encryption: none
+Comment: This is a test ppk file
+Public-Lines: 2
+AAAABHRlc3QAAABKVGhpcyBpcyB0aGUgcHVibGljIGJsb2IgZnJvbSBhIHBwayBm
+aWxlIGNyZWF0ZWQgZm9yIHRlc3RpbmcgcHVycG9zZXMgb25seS4=
+Private-Lines: 3
+AAAAd1RoaXMgaXMgdGhlIHByaXZhdGUgYmxvYiBmcm9tIGEgcHBrIGZpbGUgY3Jl
+YXRlZCBmb3IgdGVzdGluZyBwdXJwb3NlcyBvbmx5LiBJdCBpcyBzbGlnaHRseSBs
+b25nZXIgdGhhbiB0aGUgcHVibGljIGJsb2Iu

data/test/openssl_test.rb

@@ -12,33 +12,61 @@ class OpenSSLTest < Minitest::Test
   end
 
   def test_from_ppk_unsupported_algorithm
-    ppk = PuTTY::Key::PPK.new(fixture_path('test.ppk'))
+    ppk = PuTTY::Key::PPK.new(fixture_path('test-format-2.ppk'))
     assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
   end
 
-  def test_from_ppk_rsa
-    ppk = PuTTY::Key::PPK.new(fixture_path('rsa-2048.ppk'))
+  def test_from_ppk_rsa_format_2
+    ppk = PuTTY::Key::PPK.new(fixture_path('rsa-2048-format-2.ppk'))
     pkey = OpenSSL::PKey.from_ppk(ppk)
     assert_kind_of(OpenSSL::PKey::RSA, pkey)
     assert_equal(normalize_pem_fixture('rsa-2048.pem'), pkey.to_pem)
   end
 
-  def test_from_ppk_rsa_encrypted
-    ppk = PuTTY::Key::PPK.new(fixture_path('rsa-2048-encrypted.ppk'), 'Test Passphrase')
+  def test_from_ppk_rsa_encrypted_format_2
+    ppk = PuTTY::Key::PPK.new(fixture_path('rsa-2048-encrypted-format-2.ppk'), 'Test Passphrase')
     pkey = OpenSSL::PKey.from_ppk(ppk)
     assert_kind_of(OpenSSL::PKey::RSA, pkey)
     assert_equal(normalize_pem_fixture('rsa-2048.pem'), pkey.to_pem)
   end
 
-  def test_from_ppk_dss
-    ppk = PuTTY::Key::PPK.new(fixture_path('dss-1024.ppk'))
+  def test_from_ppk_rsa_format_3
+    ppk = PuTTY::Key::PPK.new(fixture_path('rsa-2048-format-3.ppk'))
+    pkey = OpenSSL::PKey.from_ppk(ppk)
+    assert_kind_of(OpenSSL::PKey::RSA, pkey)
+    assert_equal(normalize_pem_fixture('rsa-2048.pem'), pkey.to_pem)
+  end
+
+  def test_from_ppk_rsa_encrypted_format_3
+    ppk = PuTTY::Key::PPK.new(fixture_path('rsa-2048-encrypted-format-3.ppk'), 'Test Passphrase')
+    pkey = OpenSSL::PKey.from_ppk(ppk)
+    assert_kind_of(OpenSSL::PKey::RSA, pkey)
+    assert_equal(normalize_pem_fixture('rsa-2048.pem'), pkey.to_pem)
+  end
+
+  def test_from_ppk_dss_format_2
+    ppk = PuTTY::Key::PPK.new(fixture_path('dss-1024-format-2.ppk'))
+    pkey = OpenSSL::PKey.from_ppk(ppk)
+    assert_kind_of(OpenSSL::PKey::DSA, pkey)
+    assert_equal(normalize_pem_fixture('dss-1024.pem'), pkey.to_pem)
+  end
+
+  def test_from_ppk_dss_encrypted_format_2
+    ppk = PuTTY::Key::PPK.new(fixture_path('dss-1024-encrypted-format-2.ppk'), 'Test Passphrase')
+    pkey = OpenSSL::PKey.from_ppk(ppk)
+    assert_kind_of(OpenSSL::PKey::DSA, pkey)
+    assert_equal(normalize_pem_fixture('dss-1024.pem'), pkey.to_pem)
+  end
+
+  def test_from_ppk_dss_format_3
+    ppk = PuTTY::Key::PPK.new(fixture_path('dss-1024-format-3.ppk'))
     pkey = OpenSSL::PKey.from_ppk(ppk)
     assert_kind_of(OpenSSL::PKey::DSA, pkey)
     assert_equal(normalize_pem_fixture('dss-1024.pem'), pkey.to_pem)
   end
 
-  def test_from_ppk_dss_encrypted
-    ppk = PuTTY::Key::PPK.new(fixture_path('dss-1024-encrypted.ppk'), 'Test Passphrase')
+  def test_from_ppk_dss_encrypted_format_3
+    ppk = PuTTY::Key::PPK.new(fixture_path('dss-1024-encrypted-format-3.ppk'), 'Test Passphrase')
     pkey = OpenSSL::PKey.from_ppk(ppk)
     assert_kind_of(OpenSSL::PKey::DSA, pkey)
     assert_equal(normalize_pem_fixture('dss-1024.pem'), pkey.to_pem)
@@ -46,75 +74,147 @@ class OpenSSLTest < Minitest::Test
 
   # Old versions of jruby-openssl don't include an EC class (version 0.9.16).
   if defined?(OpenSSL::PKey::EC)
-    def test_from_ppk_ecdsa_sha2_nistp256
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256.ppk'))
+    def test_from_ppk_ecdsa_sha2_nistp256_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-format-2.ppk'))
+      pkey = OpenSSL::PKey.from_ppk(ppk)
+      assert_kind_of(OpenSSL::PKey::EC, pkey)
+      assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC), pkey.to_pem)
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp256_encrypted_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-encrypted-format-2.ppk'), 'Test Passphrase')
+      pkey = OpenSSL::PKey.from_ppk(ppk)
+      assert_kind_of(OpenSSL::PKey::EC, pkey)
+      assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC), pkey.to_pem)
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp256_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-format-3.ppk'))
       pkey = OpenSSL::PKey.from_ppk(ppk)
       assert_kind_of(OpenSSL::PKey::EC, pkey)
       assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC), pkey.to_pem)
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp256_encrypted
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-encrypted.ppk'), 'Test Passphrase')
+    def test_from_ppk_ecdsa_sha2_nistp256_encrypted_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-encrypted-format-3.ppk'), 'Test Passphrase')
       pkey = OpenSSL::PKey.from_ppk(ppk)
       assert_kind_of(OpenSSL::PKey::EC, pkey)
       assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC), pkey.to_pem)
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp384
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384.ppk'))
+    def test_from_ppk_ecdsa_sha2_nistp384_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-format-2.ppk'))
+      pkey = OpenSSL::PKey.from_ppk(ppk)
+      assert_kind_of(OpenSSL::PKey::EC, pkey)
+      assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC), pkey.to_pem)
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp384_encrypted_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-encrypted-format-2.ppk'), 'Test Passphrase')
+      pkey = OpenSSL::PKey.from_ppk(ppk)
+      assert_kind_of(OpenSSL::PKey::EC, pkey)
+      assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC), pkey.to_pem)
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp384_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-format-3.ppk'))
       pkey = OpenSSL::PKey.from_ppk(ppk)
       assert_kind_of(OpenSSL::PKey::EC, pkey)
       assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC), pkey.to_pem)
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp384_encrypted
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-encrypted.ppk'), 'Test Passphrase')
+    def test_from_ppk_ecdsa_sha2_nistp384_encrypted_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-encrypted-format-3.ppk'), 'Test Passphrase')
       pkey = OpenSSL::PKey.from_ppk(ppk)
       assert_kind_of(OpenSSL::PKey::EC, pkey)
       assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC), pkey.to_pem)
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp521
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521.ppk'))
+    def test_from_ppk_ecdsa_sha2_nistp521_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-format-2.ppk'))
+      pkey = OpenSSL::PKey.from_ppk(ppk)
+      assert_kind_of(OpenSSL::PKey::EC, pkey)
+      assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC), pkey.to_pem)
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp521_encrypted_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-encrypted-format-2.ppk'), 'Test Passphrase')
+      pkey = OpenSSL::PKey.from_ppk(ppk)
+      assert_kind_of(OpenSSL::PKey::EC, pkey)
+      assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC), pkey.to_pem)
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp521_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-format-3.ppk'))
       pkey = OpenSSL::PKey.from_ppk(ppk)
       assert_kind_of(OpenSSL::PKey::EC, pkey)
       assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC), pkey.to_pem)
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp521_encrypted
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-encrypted.ppk'), 'Test Passphrase')
+    def test_from_ppk_ecdsa_sha2_nistp521_encrypted_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-encrypted-format-3.ppk'), 'Test Passphrase')
       pkey = OpenSSL::PKey.from_ppk(ppk)
       assert_kind_of(OpenSSL::PKey::EC, pkey)
       assert_equal(normalize_pem_fixture('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC), pkey.to_pem)
     end
   else
-    def test_from_ppk_ecdsa_sha2_nistp256
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256.ppk'))
+    def test_from_ppk_ecdsa_sha2_nistp256_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-format-2.ppk'))
+      assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp256_encrypted_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-encrypted-format-2.ppk'), 'Test Passphrase')
+      assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp256_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-format-3.ppk'))
+      assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp256_encrypted_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-encrypted-format-3.ppk'), 'Test Passphrase')
+      assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp384_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-format-2.ppk'))
+      assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp384_encrypted_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-encrypted-format-2.ppk'), 'Test Passphrase')
+      assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
+    end
+
+    def test_from_ppk_ecdsa_sha2_nistp384_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-format-3.ppk'))
       assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp256_encrypted
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp256-encrypted.ppk'), 'Test Passphrase')
+    def test_from_ppk_ecdsa_sha2_nistp384_encrypted_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-encrypted-format-3.ppk'), 'Test Passphrase')
       assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp384
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384.ppk'))
+    def test_from_ppk_ecdsa_sha2_nistp521_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-format-2.ppk'))
       assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp384_encrypted
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp384-encrypted.ppk'), 'Test Passphrase')
+    def test_from_ppk_ecdsa_sha2_nistp521_encrypted_format_2
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-encrypted-format-2.ppk'), 'Test Passphrase')
       assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp521
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521.ppk'))
+    def test_from_ppk_ecdsa_sha2_nistp521_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-format-3.ppk'))
       assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
     end
 
-    def test_from_ppk_ecdsa_sha2_nistp521_encrypted
-      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-encrypted.ppk'), 'Test Passphrase')
+    def test_from_ppk_ecdsa_sha2_nistp521_encrypted_format_3
+      ppk = PuTTY::Key::PPK.new(fixture_path('ecdsa-sha2-nistp521-encrypted-format-3.ppk'), 'Test Passphrase')
       assert_raises(ArgumentError) { OpenSSL::PKey.from_ppk(ppk) }
     end
   end
@@ -141,21 +241,39 @@ class OpenSSLTest < Minitest::Test
     pkey.to_pem
   end
 
-  def test_to_ppk_rsa
+  def test_to_ppk_rsa_format_2
     ppk = pem_to_ppk('rsa-2048.pem')
     ppk.comment = '2048 bit RSA key'
     temp_file_name do |file|
       ppk.save(file)
-      assert_identical_to_fixture('rsa-2048.ppk', file)
+      assert_identical_to_fixture('rsa-2048-format-2.ppk', file)
     end
   end
 
-  def test_to_ppk_rsa_encrypted
+  def test_to_ppk_rsa_encrypted_format_2
     ppk = pem_to_ppk('rsa-2048.pem')
     ppk.comment = '2048 bit RSA key'
     temp_file_name do |file|
       ppk.save(file, 'Test Passphrase')
-      assert_identical_to_fixture('rsa-2048-encrypted.ppk', file)
+      assert_identical_to_fixture('rsa-2048-encrypted-format-2.ppk', file)
+    end
+  end
+
+  def test_to_ppk_rsa_format_3
+    ppk = pem_to_ppk('rsa-2048.pem')
+    ppk.comment = '2048 bit RSA key'
+    temp_file_name do |file|
+      ppk.save(file, format: 3)
+      assert_identical_to_fixture('rsa-2048-format-3.ppk', file)
+    end
+  end
+
+  def test_to_ppk_rsa_encrypted_format_3
+    ppk = pem_to_ppk('rsa-2048.pem')
+    ppk.comment = '2048 bit RSA key'
+    temp_file_name do |file|
+      ppk.save(file, 'Test Passphrase', format: 3, argon2_params: PuTTY::Key::Argon2Params.new(memory: 16384, parallelism: 2, passes: 14, salt: "\xcc\x2e\xc7\x12\xee\x7e\x17\xbc\x2b\x9e\x3c\x47\xf5\xbb\xb0\x66".b))
+      assert_identical_to_fixture('rsa-2048-encrypted-format-3.ppk', file)
     end
   end
 
@@ -164,21 +282,39 @@ class OpenSSLTest < Minitest::Test
     assert_raises(PuTTY::Key::InvalidStateError) { pkey.to_ppk }
   end
 
-  def test_to_ppk_dss
+  def test_to_ppk_dss_format_2
     ppk = pem_to_ppk('dss-1024.pem')
     ppk.comment = '1024 bit DSS key'
     temp_file_name do |file|
       ppk.save(file)
-      assert_identical_to_fixture('dss-1024.ppk', file)
+      assert_identical_to_fixture('dss-1024-format-2.ppk', file)
     end
   end
 
-  def test_to_ppk_dss_encrypted
+  def test_to_ppk_dss_encrypted_format_2
     ppk = pem_to_ppk('dss-1024.pem')
     ppk.comment = '1024 bit DSS key'
     temp_file_name do |file|
       ppk.save(file, 'Test Passphrase')
-      assert_identical_to_fixture('dss-1024-encrypted.ppk', file)
+      assert_identical_to_fixture('dss-1024-encrypted-format-2.ppk', file)
+    end
+  end
+
+  def test_to_ppk_dss_format_3
+    ppk = pem_to_ppk('dss-1024.pem')
+    ppk.comment = '1024 bit DSS key'
+    temp_file_name do |file|
+      ppk.save(file, format: 3)
+      assert_identical_to_fixture('dss-1024-format-3.ppk', file)
+    end
+  end
+
+  def test_to_ppk_dss_encrypted_format_3
+    ppk = pem_to_ppk('dss-1024.pem')
+    ppk.comment = '1024 bit DSS key'
+    temp_file_name do |file|
+      ppk.save(file, 'Test Passphrase', format: 3, argon2_params: PuTTY::Key::Argon2Params.new(passes: 13, salt: "\x1a\x21\x57\x42\xbf\x63\xed\x4e\xef\xed\x21\xdd\x07\x68\x36\x40".b))
+      assert_identical_to_fixture('dss-1024-encrypted-format-3.ppk', file)
     end
   end
 
@@ -189,57 +325,111 @@ class OpenSSLTest < Minitest::Test
 
   # Old versions of jruby-openssl don't include an EC class (version 0.9.16).
   if defined?(OpenSSL::PKey::EC)
-    def test_to_ppk_ecdsa_sha2_nistp256
+    def test_to_ppk_ecdsa_sha2_nistp256_format_2
       ppk = pem_to_ppk('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC)
       ppk.comment = 'ECDSA NIST P-256 Key'
       temp_file_name do |file|
         ppk.save(file)
-        assert_identical_to_fixture('ecdsa-sha2-nistp256.ppk', file)
+        assert_identical_to_fixture('ecdsa-sha2-nistp256-format-2.ppk', file)
       end
     end
 
-    def test_to_ppk_ecdsa_sha2_nistp256_encrypted
+    def test_to_ppk_ecdsa_sha2_nistp256_encrypted_format_2
       ppk = pem_to_ppk('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC)
       ppk.comment = 'ECDSA NIST P-256 Key'
       temp_file_name do |file|
         ppk.save(file, 'Test Passphrase')
-        assert_identical_to_fixture('ecdsa-sha2-nistp256-encrypted.ppk', file)
+        assert_identical_to_fixture('ecdsa-sha2-nistp256-encrypted-format-2.ppk', file)
+      end
+    end
+
+    def test_to_ppk_ecdsa_sha2_nistp256_format_3
+      ppk = pem_to_ppk('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC)
+      ppk.comment = 'ECDSA NIST P-256 Key'
+      temp_file_name do |file|
+        ppk.save(file, format: 3)
+        assert_identical_to_fixture('ecdsa-sha2-nistp256-format-3.ppk', file)
+      end
+    end
+
+    def test_to_ppk_ecdsa_sha2_nistp256_encrypted_format_3
+      ppk = pem_to_ppk('ecdsa-sha2-nistp256.pem', OpenSSL::PKey::EC)
+      ppk.comment = 'ECDSA NIST P-256 Key'
+      temp_file_name do |file|
+        ppk.save(file, 'Test Passphrase', format: 3, argon2_params: PuTTY::Key::Argon2Params.new(type: :i, memory: 4096, passes: 12, salt: "\xba\x83\x64\xf0\xda\x7d\x81\x33\xbb\xd5\xf7\x39\x6a\xc2\x80\xf8".b))
+        assert_identical_to_fixture('ecdsa-sha2-nistp256-encrypted-format-3.ppk', file)
       end
     end
 
-    def test_to_ppk_ecdsa_sha2_nistp384
+    def test_to_ppk_ecdsa_sha2_nistp384_format_2
       ppk = pem_to_ppk('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC)
       ppk.comment = 'ECDSA NIST P-384 Key'
       temp_file_name do |file|
         ppk.save(file)
-        assert_identical_to_fixture('ecdsa-sha2-nistp384.ppk', file)
+        assert_identical_to_fixture('ecdsa-sha2-nistp384-format-2.ppk', file)
       end
     end
 
-    def test_to_ppk_ecdsa_sha2_nistp384_encrypted
+    def test_to_ppk_ecdsa_sha2_nistp384_encrypted_format_2
       ppk = pem_to_ppk('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC)
       ppk.comment = 'ECDSA NIST P-384 Key'
       temp_file_name do |file|
         ppk.save(file, 'Test Passphrase')
-        assert_identical_to_fixture('ecdsa-sha2-nistp384-encrypted.ppk', file)
+        assert_identical_to_fixture('ecdsa-sha2-nistp384-encrypted-format-2.ppk', file)
+      end
+    end
+
+    def test_to_ppk_ecdsa_sha2_nistp384_format_3
+      ppk = pem_to_ppk('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC)
+      ppk.comment = 'ECDSA NIST P-384 Key'
+      temp_file_name do |file|
+        ppk.save(file, format: 3)
+        assert_identical_to_fixture('ecdsa-sha2-nistp384-format-3.ppk', file)
+      end
+    end
+
+    def test_to_ppk_ecdsa_sha2_nistp384_encrypted_format_3
+      ppk = pem_to_ppk('ecdsa-sha2-nistp384.pem', OpenSSL::PKey::EC)
+      ppk.comment = 'ECDSA NIST P-384 Key'
+      temp_file_name do |file|
+        ppk.save(file, 'Test Passphrase', format: 3, argon2_params: PuTTY::Key::Argon2Params.new(type: :i, parallelism: 2, passes: 6, salt: "\x0e\xe1\x39\x3b\x17\xb1\xc6\xa7\x79\x2f\x13\xcb\x80\x5e\x49\x56".b))
+        assert_identical_to_fixture('ecdsa-sha2-nistp384-encrypted-format-3.ppk', file)
       end
     end
 
-    def test_to_ppk_ecdsa_sha2_nistp521
+    def test_to_ppk_ecdsa_sha2_nistp521_format_2
       ppk = pem_to_ppk('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC)
       ppk.comment = 'ECDSA NIST P-521 Key'
       temp_file_name do |file|
         ppk.save(file)
-        assert_identical_to_fixture('ecdsa-sha2-nistp521.ppk', file)
+        assert_identical_to_fixture('ecdsa-sha2-nistp521-format-2.ppk', file)
       end
     end
 
-    def test_to_ppk_ecdsa_sha2_nistp521_encrypted
+    def test_to_ppk_ecdsa_sha2_nistp521_encrypted_format_2
       ppk = pem_to_ppk('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC)
       ppk.comment = 'ECDSA NIST P-521 Key'
       temp_file_name do |file|
         ppk.save(file, 'Test Passphrase')
-        assert_identical_to_fixture('ecdsa-sha2-nistp521-encrypted.ppk', file)
+        assert_identical_to_fixture('ecdsa-sha2-nistp521-encrypted-format-2.ppk', file)
+      end
+    end
+
+    def test_to_ppk_ecdsa_sha2_nistp521_format_3
+      ppk = pem_to_ppk('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC)
+      ppk.comment = 'ECDSA NIST P-521 Key'
+      temp_file_name do |file|
+        ppk.save(file, format: 3)
+        assert_identical_to_fixture('ecdsa-sha2-nistp521-format-3.ppk', file)
+      end
+    end
+
+    def test_to_ppk_ecdsa_sha2_nistp521_encrypted_format_3
+      ppk = pem_to_ppk('ecdsa-sha2-nistp521.pem', OpenSSL::PKey::EC)
+      ppk.comment = 'ECDSA NIST P-521 Key'
+      temp_file_name do |file|
+        ppk.save(file, 'Test Passphrase', format: 3, argon2_params: PuTTY::Key::Argon2Params.new(type: :d, memory: 9220, passes: 13, salt: "\xea\x6c\x6e\xae\x1e\x22\xcb\x94\x49\xf8\x5c\x96\x57\xc2\x91\x57".b))
+        assert_identical_to_fixture('ecdsa-sha2-nistp521-encrypted-format-3.ppk', file)
       end
     end