diff options
| author | lloyd <[email protected]> | 2010-07-09 15:06:31 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-07-09 15:06:31 +0000 |
| commit | f9162c355d3cee11be911c4cf469044b5c3c4699 (patch) | |
| tree | 710c305d8e0f965543f56dc06ce2535c842fc524 /checks/validate.dat | |
| parent | 14bfa0d15fc666b83a0b58a0713abba76c85dc41 (diff) | |
Rename S2K to PBKDF, because that is by far the most common name - S2K
really is only used by OpenPGP, and largely it was named S2K here
because the OpenPGP S2K was implemented years before the ones in PKCS
#5. We have a typedef of PBKDF to S2K, and an inlined get_s2k that
calls get_pbkdf for source compatability.
There doesn't seem to be any reason to have a forward for the renamed
s2k.h header - to actually use a PBKDF, you'd have to either include
lookup.h and call get_s2k / get_pbkdf, or else include an
algorithm-specific header and use it directly. In either case,
including s2k.h is neither necessary nor sufficient.
Diffstat (limited to 'checks/validate.dat')
| -rw-r--r-- | checks/validate.dat | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/checks/validate.dat b/checks/validate.dat index aaeb7f013..cea1f18fc 100644 --- a/checks/validate.dat +++ b/checks/validate.dat @@ -1,8 +1,8 @@ # Main Botan validation file -# This has test vectors for block ciphers in ECB mode, stream ciphers, hash -# functions, MACs, KDFs, S2K algorithms, encoders/decoders, and block cipher -# modes (CBC, CTS, CFB, OFB, CTR, and EAX) +# This has test vectors for block ciphers in ECB mode, stream ciphers, +# hash functions, MACs, KDFs, PBKDFs, encoders/decoders, and block +# cipher modes (CBC, CTS, CFB, OFB, CTR, XTS, and EAX) # MARKER: Block Ciphers @@ -60553,9 +60553,9 @@ A09661392376F7044D9052A397883246B67F5F1EF63EB5FB::24 0123456789ABCDEFFEDCBA98765432010123456789ABCDEFFEDCBA9876543201\ 0123456789ABCDEFFEDCBA98765432010123456789ABCDEFFEDCBA9876543201:16 -# MARKER: S2K Algorithms +# MARKER: PBKDF Algorithms -# S2K format: passphrase:output:salt:out_len:iterations +# PBKDF format: passphrase:output:salt:out_len:iterations [OpenPGP-S2K(SHA-1)] 666F6F:0BEEC7B5EA3F0FDBC95D0DD47F3C5BC275DA8A335A8CAA4039FDBC02C01A649C::32:0 |