Merge pull request #473 from libtom/fixup/padding_pad

sjaeckel · web-flow · commit 01c455c3d5f7 · 2018-12-17T15:44:02.000+01:00
fix compilation of padding_pad
diff --git a/src/misc/padding/padding_pad.c b/src/misc/padding/padding_pad.c
@@ -99,11 +99,15 @@ int padding_pad(unsigned char *data, unsigned long length, unsigned long* padded
    type = mode & LTC_PAD_MASK;
 
    if (*padded_length < l) {
+#ifdef LTC_RNG_GET_BYTES
       if (type != LTC_PAD_ISO_10126) {
          *padded_length = l;
       } else {
          *padded_length = length + 256;
       }
+#else
+      *padded_length = l;
+#endif
       return CRYPT_BUFFER_OVERFLOW;
    }
 

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,15 @@ int padding_pad(unsigned char data, unsigned long length, unsigned long padded`
`99`	`99`	`type = mode & LTC_PAD_MASK;`
`100`	`100`
`101`	`101`	`if (*padded_length < l) {`
	`102`	`+#ifdef LTC_RNG_GET_BYTES`
`102`	`103`	`if (type != LTC_PAD_ISO_10126) {`
`103`	`104`	`*padded_length = l;`
`104`	`105`	`} else {`
`105`	`106`	`*padded_length = length + 256;`
`106`	`107`	`}`
	`108`	`+#else`
	`109`	`+ *padded_length = l;`
	`110`	`+#endif`
`107`	`111`	`return CRYPT_BUFFER_OVERFLOW;`
`108`	`112`	`}`
`109`	`113`