Revert "ISO 10126 padding - related to #54"
This reverts commit 6a66eaa40ab684a06856383ac7e70a7d7ad06bb4.
Karel Miko
4 years ago
119 | 119 |
# 3 ANSI X.923 padding
|
120 | 120 |
# 4 zero padding
|
121 | 121 |
# 5 zero padding (+a block of zeros if the output length is divisible by the blocksize)
|
122 | |
# 6 ISO 10126 padding
|
123 | 122 |
# $cipher_rounds ... optional num of rounds for given cipher
|
124 | 123 |
[%-ELSE%]
|
125 | 124 |
my $m = Crypt::Mode::[%orig_name%]->new($name);
|
235 | 235 |
else if (self->padding_mode == 3) { padmode = LTC_PAD_ANSI_X923 | (&self->state)->blocklen; }
|
236 | 236 |
else if (self->padding_mode == 4) { padmode = LTC_PAD_ZERO | (&self->state)->blocklen; }
|
237 | 237 |
else if (self->padding_mode == 5) { padmode = LTC_PAD_ZERO_ALWAYS | (&self->state)->blocklen; }
|
238 | |
else if (self->padding_mode == 6) { padmode = LTC_PAD_ISO_10126 | (&self->state)->blocklen; }
|
239 | 238 |
else { croak("FATAL: unknown padding"); }
|
240 | 239 |
blen = sizeof(self->pad);
|
241 | 240 |
rv = padding_pad(self->pad, self->padlen, &blen, padmode);
|
|
259 | 258 |
else if (self->padding_mode == 3) { padmode = LTC_PAD_ANSI_X923 | (&self->state)->blocklen; }
|
260 | 259 |
else if (self->padding_mode == 4) { padmode = LTC_PAD_ZERO | (&self->state)->blocklen; }
|
261 | 260 |
else if (self->padding_mode == 5) { padmode = LTC_PAD_ZERO_ALWAYS | (&self->state)->blocklen; }
|
262 | |
else if (self->padding_mode == 6) { padmode = LTC_PAD_ISO_10126 | (&self->state)->blocklen; }
|
263 | 261 |
else { croak("FATAL: unknown padding"); }
|
264 | 262 |
rv = padding_depad(tmp_block, &blen, padmode);
|
265 | 263 |
if (rv != CRYPT_OK) croak("FATAL: padding_depad failed: %s", error_to_string(rv));
|
223 | 223 |
else if (self->padding_mode == 3) { padmode = LTC_PAD_ANSI_X923 | (&self->state)->blocklen; }
|
224 | 224 |
else if (self->padding_mode == 4) { padmode = LTC_PAD_ZERO | (&self->state)->blocklen; }
|
225 | 225 |
else if (self->padding_mode == 5) { padmode = LTC_PAD_ZERO_ALWAYS | (&self->state)->blocklen; }
|
226 | |
else if (self->padding_mode == 6) { padmode = LTC_PAD_ISO_10126 | (&self->state)->blocklen; }
|
227 | 226 |
else { croak("FATAL: unknown padding"); }
|
228 | 227 |
blen = sizeof(self->pad);
|
229 | 228 |
rv = padding_pad(self->pad, self->padlen, &blen, padmode);
|
|
247 | 246 |
else if (self->padding_mode == 3) { padmode = LTC_PAD_ANSI_X923 | (&self->state)->blocklen; }
|
248 | 247 |
else if (self->padding_mode == 4) { padmode = LTC_PAD_ZERO | (&self->state)->blocklen; }
|
249 | 248 |
else if (self->padding_mode == 5) { padmode = LTC_PAD_ZERO_ALWAYS | (&self->state)->blocklen; }
|
250 | |
else if (self->padding_mode == 6) { padmode = LTC_PAD_ISO_10126 | (&self->state)->blocklen; }
|
251 | 249 |
else { croak("FATAL: unknown padding"); }
|
252 | 250 |
rv = padding_depad(tmp_block, &blen, padmode);
|
253 | 251 |
if (rv != CRYPT_OK) croak("FATAL: padding_depad failed: %s", error_to_string(rv));
|
216 | 216 |
else if (self->padding_mode == 3) { padmode = LTC_PAD_ANSI_X923 | (&self->state)->blocklen; }
|
217 | 217 |
else if (self->padding_mode == 4) { padmode = LTC_PAD_ZERO | (&self->state)->blocklen; }
|
218 | 218 |
else if (self->padding_mode == 5) { padmode = LTC_PAD_ZERO_ALWAYS | (&self->state)->blocklen; }
|
219 | |
else if (self->padding_mode == 6) { padmode = LTC_PAD_ISO_10126 | (&self->state)->blocklen; }
|
220 | 219 |
else { croak("FATAL: unknown padding"); }
|
221 | 220 |
blen = sizeof(self->pad);
|
222 | 221 |
rv = padding_pad(self->pad, self->padlen, &blen, padmode);
|
|
240 | 239 |
else if (self->padding_mode == 3) { padmode = LTC_PAD_ANSI_X923 | (&self->state)->blocklen; }
|
241 | 240 |
else if (self->padding_mode == 4) { padmode = LTC_PAD_ZERO | (&self->state)->blocklen; }
|
242 | 241 |
else if (self->padding_mode == 5) { padmode = LTC_PAD_ZERO_ALWAYS | (&self->state)->blocklen; }
|
243 | |
else if (self->padding_mode == 6) { padmode = LTC_PAD_ISO_10126 | (&self->state)->blocklen; }
|
244 | 242 |
else { croak("FATAL: unknown padding"); }
|
245 | 243 |
rv = padding_depad(tmp_block, &blen, padmode);
|
246 | 244 |
if (rv != CRYPT_OK) croak("FATAL: padding_depad failed: %s", error_to_string(rv));
|
75 | 75 |
# 3 ANSI X.923 padding
|
76 | 76 |
# 4 zero padding
|
77 | 77 |
# 5 zero padding (+a block of zeros if the output length is divisible by the blocksize)
|
78 | |
# 6 ISO 10126 padding
|
79 | 78 |
# $cipher_rounds ... optional num of rounds for given cipher
|
80 | 79 |
|
81 | 80 |
=head2 encrypt
|
76 | 76 |
# 3 ANSI X.923 padding
|
77 | 77 |
# 4 zero padding
|
78 | 78 |
# 5 zero padding (+a block of zeros if the output length is divisible by the blocksize)
|
79 | |
# 6 ISO 10126 padding
|
80 | 79 |
# $cipher_rounds ... optional num of rounds for given cipher
|
81 | 80 |
|
82 | 81 |
=head2 encrypt
|