Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a new KDF algorithm type for scrypt. Field names are pulled exactly from RFC7914.
Added some logic (but no direct tests for it) in
EncryptionAlgorithm.kdf_hmac
andEncryptionAlgorithm.kdf_iterations
to returnNone
as scrypt has no concept of those, but as it has both asalt
and (optional)key_length
parameter,EncryptionAlgorithm.kdf_salt
andEncryptionAlgorithm.key_length
can be left as-is. I created a test case modeled after the ccm_parameters test - it loads an entireEncryptionAlgorithm
but only tests theKdfAlgorithm
part we're interested in. Again, additional tests for thekdf_*
andkey_length
properties may be prudent. Creating other files to test with is easy usingopenssl pkcs8 -scrypt
and any of the optional switches that go with that (-scrypt_N N
,-scrypt_r r
, or-scrypt_p p
)