From 896bb17f14e44925f5cdacbe10f1e86c20b88972 Mon Sep 17 00:00:00 2001 From: Benedict Date: Mon, 1 Aug 2016 15:58:18 +0200 Subject: fixed bug in valid_pkcs_padding The input length shut be a multiple of the blocksize. However we checked if the inpute length was a multiple of the number of padded bytes. --- set2/task15.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'set2') diff --git a/set2/task15.c b/set2/task15.c index 504eabb..a40ecf3 100644 --- a/set2/task15.c +++ b/set2/task15.c @@ -1,12 +1,7 @@ #include "../lib/lib2.h" - - - int main(int argc, char **Argv) { - - char *padded_text = pkcs7_padding("YELLOW SUBMARINE", 16, 20); char *unpadded = malloc(100); //char *padded_text = "ICE ICE BABY\x01\x02\x03\x04"; @@ -18,4 +13,34 @@ int main(int argc, char **Argv) else printf("invalid padding\n"); + padded_text = pkcs7_padding("YELLOW SUBMARINE", 16, 16); + + //char *padded_text = "ICE ICE BABY\x01\x02\x03\x04"; + printf("padded text: %s\n", padded_text); + result = valid_pkcs7_padding(padded_text, 32,unpadded, 16); + + if(result) + printf("valid padding: %s\n", unpadded); + else + printf("invalid padding\n"); + + padded_text = "ICE ICE BABY\x01\x02\x03\x04"; + printf("padded text: %s\n", padded_text); + result = valid_pkcs7_padding(padded_text, 32,unpadded, 16); + + if(result) + printf("valid padding: %s\n", unpadded); + else + printf("invalid padding\n"); + char *string = "Who let the dogs out"; + padded_text = pkcs7_padding(string, strlen(string), 16); + + printf("%i, %i\n",strlen(string), strlen(padded_text)); + printf("padded text: %s\n", padded_text); + result = valid_pkcs7_padding(padded_text, strlen(padded_text),unpadded, 16); + + if(result) + printf("valid padding: %s\n", unpadded); + else + printf("invalid padding\n"); } -- cgit v1.2.3-70-g09d2