Hakase/openssl-custom
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Latest update.

Browse Source
This commit is contained in:
Hakase
2019-09-21 00:43:47 +09:00
parent 2e57f602ae
commit 62515c7d8d
1131 changed files with 47556 additions and 24957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
providers/common/ciphers/block.c
+5 -8
View File
@@ -7,11 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#include <string.h>
#include <openssl/evp.h>
#include <openssl/err.h>
#include "ciphers_locl.h"
#include <assert.h>
#include "cipher_locl.h"
#include "internal/providercommonerr.h"
/*
@@ -67,7 +64,7 @@ int trailingdata(unsigned char *buf, size_t *buflen, size_t blocksize,
return 1;
if (*buflen + *inlen > blocksize) {
PROVerr(PROV_F_TRAILINGDATA, ERR_R_INTERNAL_ERROR);
ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
return 0;
}
@@ -94,7 +91,7 @@ int unpadblock(unsigned char *buf, size_t *buflen, size_t blocksize)
size_t len = *buflen;
if(len != blocksize) {
PROVerr(PROV_F_UNPADBLOCK, ERR_R_INTERNAL_ERROR);
ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
return 0;
}
@@ -104,12 +101,12 @@ int unpadblock(unsigned char *buf, size_t *buflen, size_t blocksize)
*/
pad = buf[blocksize - 1];
if (pad == 0 || pad > blocksize) {
PROVerr(PROV_F_UNPADBLOCK, PROV_R_BAD_DECRYPT);
ERR_raise(ERR_LIB_PROV, PROV_R_BAD_DECRYPT);
return 0;
}
for (i = 0; i < pad; i++) {
if (buf[--len] != pad) {
PROVerr(PROV_F_UNPADBLOCK, PROV_R_BAD_DECRYPT);
ERR_raise(ERR_LIB_PROV, PROV_R_BAD_DECRYPT);
return 0;
}
}