gcry_error_t err;
if(!ciphertonid(algo, mode, &cipher->nid)) {
- logger(LOG_DEBUG, "Cipher %d mode %d has no corresponding nid!", algo, mode);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "Cipher %d mode %d has no corresponding nid!", algo, mode);
return false;
}
if((err = gcry_cipher_open(&cipher->handle, algo, mode, 0))) {
- logger(LOG_DEBUG, "Unable to intialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "Unable to intialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
return false;
}
int algo, mode;
if(!nametocipher(name, &algo, &mode)) {
- logger(LOG_DEBUG, "Unknown cipher name '%s'!", name);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown cipher name '%s'!", name);
return false;
}
int algo, mode;
if(!nidtocipher(nid, &algo, &mode)) {
- logger(LOG_DEBUG, "Unknown cipher ID %d!", nid);
+ logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown cipher ID %d!", nid);
return false;
}
if(!oneshot)
return false;
- size_t reqlen = ((inlen + 1) / cipher->blklen) * cipher->blklen;
+ size_t reqlen = ((inlen + cipher->blklen) / cipher->blklen) * cipher->blklen;
+
+ if(*outlen < reqlen) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: not enough room for padding");
+ return false;
+ }
+
uint8_t padbyte = reqlen - inlen;
inlen = reqlen - cipher->blklen;
else
pad[i] = padbyte;
}
-
+
+ if(oneshot)
+ gcry_cipher_setiv(cipher->handle, cipher->key + cipher->keylen, cipher->blklen);
+
if((err = gcry_cipher_encrypt(cipher->handle, outdata, *outlen, indata, inlen))) {
- logger(LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
return false;
}
if(cipher->padding) {
if((err = gcry_cipher_encrypt(cipher->handle, outdata + inlen, cipher->blklen, pad, cipher->blklen))) {
- logger(LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
return false;
}
bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
gcry_error_t err;
+ if(oneshot)
+ gcry_cipher_setiv(cipher->handle, cipher->key + cipher->keylen, cipher->blklen);
+
if((err = gcry_cipher_decrypt(cipher->handle, outdata, *outlen, indata, inlen))) {
- logger(LOG_ERR, "Error while decrypting: %s", gcry_strerror(err));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: %s", gcry_strerror(err));
return false;
}
uint8_t padbyte = ((uint8_t *)outdata)[inlen - 1];
- if(padbyte == 0 || padbyte > cipher->blklen || padbyte > inlen)
+ if(padbyte == 0 || padbyte > cipher->blklen || padbyte > inlen) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: invalid padding");
return false;
+ }
size_t origlen = inlen - padbyte;
for(int i = inlen - 1; i >= origlen; i--)
- if(((uint8_t *)indata)[i] != padbyte)
+ if(((uint8_t *)outdata)[i] != padbyte) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: invalid padding");
return false;
+ }
*outlen = origlen;
- }
+ } else
+ *outlen = inlen;
return true;
}