Mercurial > projects > dcrypt
diff dcrypt/crypto/padding/PKCS7.d @ 27:8b5eaf3c2979
Fixed error in hash message padding reported by Glenn Haecker.
author | Thomas Dixon <reikon@reikon.us> |
---|---|
date | Sat, 09 May 2009 23:29:20 -0400 |
parents | cd376996cdb3 |
children | ad687db713a4 |
line wrap: on
line diff
--- a/dcrypt/crypto/padding/PKCS7.d Sun Mar 01 13:06:48 2009 -0500 +++ b/dcrypt/crypto/padding/PKCS7.d Sat May 09 23:29:20 2009 -0400 @@ -14,12 +14,15 @@ * This class implements the padding scheme described in PKCS7 * from RSA Security. Ex. [... 0x03, 0x03, 0x03] */ -class PKCS7 : BlockCipherPadding { - char[] name() { +class PKCS7 : BlockCipherPadding +{ + char[] name() + { return "PKCS7"; } - ubyte[] pad(uint len) { + ubyte[] pad(uint len) + { ubyte[] output = new ubyte[len]; output[0..output.length] = cast(byte)len; @@ -27,7 +30,8 @@ return output; } - uint unpad(void[] input_) { + uint unpad(void[] input_) + { ubyte[] input = cast(ubyte[]) input_; ubyte len = input[input.length-1]; @@ -38,8 +42,8 @@ uint limit = input.length; for (int i = 0; i < len; i++) if (input[--limit] != len) - throw new InvalidPaddingError( - name()~": Pad value does not match pad length."); + throw new InvalidPaddingError(name()~": Pad value does not match pad length."); + return len; } }