| commit | 9a73632fd9f4e08047b88230c24aa2133c8f880e | [log] [tgz] |
|---|---|---|
| author | Paul Bakker <p.j.bakker@polarssl.org> | Wed Nov 14 12:39:52 2012 +0000 |
| committer | Paul Bakker <p.j.bakker@polarssl.org> | Wed Nov 14 12:39:52 2012 +0000 |
| tree | ceb8276cd26f17ba556397ae81b192bbbc885909 | |
| parent | 97872aceb6d438617b3b325cd7e0b402f3ae882f [diff] [blame] |
- Merged changesets 1399 up to and including 1415 into 1.2 branch
diff --git a/library/pkcs11.c b/library/pkcs11.c index b71415a..b68d688 100644 --- a/library/pkcs11.c +++ b/library/pkcs11.c
@@ -115,7 +115,7 @@ int mode, size_t *olen, const unsigned char *input, unsigned char *output, - unsigned int output_max_len ) + size_t output_max_len ) { size_t input_len, output_len;