projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assign more suitable types and fix narrowing conversion warns.
[tinc]
/
src
/
gcrypt
/
cipher.c
diff --git
a/src/gcrypt/cipher.c
b/src/gcrypt/cipher.c
index
2e8e057
..
8306531
100644
(file)
--- a/
src/gcrypt/cipher.c
+++ b/
src/gcrypt/cipher.c
@@
-1,6
+1,6
@@
/*
cipher.c -- Symmetric block cipher handling
/*
cipher.c -- Symmetric block cipher handling
- Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007
-2012
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-55,7
+55,7
@@
static struct {
static bool nametocipher(const char *name, int *algo, int *mode) {
size_t i;
static bool nametocipher(const char *name, int *algo, int *mode) {
size_t i;
- for(i = 0; i < sizeof
ciphertable / sizeof *ciphertable
; i++) {
+ for(i = 0; i < sizeof
(ciphertable) / sizeof(*ciphertable)
; i++) {
if(ciphertable[i].name && !strcasecmp(name, ciphertable[i].name)) {
*algo = ciphertable[i].algo;
*mode = ciphertable[i].mode;
if(ciphertable[i].name && !strcasecmp(name, ciphertable[i].name)) {
*algo = ciphertable[i].algo;
*mode = ciphertable[i].mode;
@@
-69,7
+69,7
@@
static bool nametocipher(const char *name, int *algo, int *mode) {
static bool nidtocipher(int nid, int *algo, int *mode) {
size_t i;
static bool nidtocipher(int nid, int *algo, int *mode) {
size_t i;
- for(i = 0; i < sizeof
ciphertable / sizeof *ciphertable
; i++) {
+ for(i = 0; i < sizeof
(ciphertable) / sizeof(*ciphertable)
; i++) {
if(nid == ciphertable[i].nid) {
*algo = ciphertable[i].algo;
*mode = ciphertable[i].mode;
if(nid == ciphertable[i].nid) {
*algo = ciphertable[i].algo;
*mode = ciphertable[i].mode;
@@
-83,7
+83,7
@@
static bool nidtocipher(int nid, int *algo, int *mode) {
static bool ciphertonid(int algo, int mode, int *nid) {
size_t i;
static bool ciphertonid(int algo, int mode, int *nid) {
size_t i;
- for(i = 0; i < sizeof
ciphertable / sizeof *ciphertable
; i++) {
+ for(i = 0; i < sizeof
(ciphertable) / sizeof(*ciphertable)
; i++) {
if(algo == ciphertable[i].algo && mode == ciphertable[i].mode) {
*nid = ciphertable[i].nid;
return true;
if(algo == ciphertable[i].algo && mode == ciphertable[i].mode) {
*nid = ciphertable[i].nid;
return true;
@@
-97,12
+97,12
@@
static bool cipher_open(cipher_t *cipher, int algo, int mode) {
gcry_error_t err;
if(!ciphertonid(algo, mode, &cipher->nid)) {
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))) {
return false;
}
if((err = gcry_cipher_open(&cipher->handle, algo, mode, 0))) {
- logger(
LOG_DEBUG, "Unable to in
tialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
+ logger(
DEBUG_ALWAYS, LOG_DEBUG, "Unable to ini
tialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
return false;
}
return false;
}
@@
-118,7
+118,7
@@
bool cipher_open_by_name(cipher_t *cipher, const char *name) {
int algo, mode;
if(!nametocipher(name, &algo, &mode)) {
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;
}
return false;
}
@@
-129,7
+129,7
@@
bool cipher_open_by_nid(cipher_t *cipher, int nid) {
int algo, mode;
if(!nidtocipher(nid, &algo, &mode)) {
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;
}
return false;
}
@@
-146,10
+146,8
@@
void cipher_close(cipher_t *cipher) {
cipher->handle = NULL;
}
cipher->handle = NULL;
}
- if(cipher->key) {
- free(cipher->key);
- cipher->key = NULL;
- }
+ free(cipher->key);
+ cipher->key = NULL;
}
size_t cipher_keylength(const cipher_t *cipher) {
}
size_t cipher_keylength(const cipher_t *cipher) {
@@
-193,28
+191,40
@@
bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
uint8_t pad[cipher->blklen];
if(cipher->padding) {
uint8_t pad[cipher->blklen];
if(cipher->padding) {
- if(!oneshot)
+ if(!oneshot)
{
return false;
return false;
+ }
+
+ 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;
+ }
- size_t reqlen = ((inlen + 1) / cipher->blklen) * cipher->blklen;
uint8_t padbyte = reqlen - inlen;
inlen = reqlen - cipher->blklen;
for(int i = 0; i < cipher->blklen; i++)
uint8_t padbyte = reqlen - inlen;
inlen = reqlen - cipher->blklen;
for(int i = 0; i < cipher->blklen; i++)
- if(i < cipher->blklen - padbyte)
+ if(i < cipher->blklen - padbyte)
{
pad[i] = ((uint8_t *)indata)[inlen + i];
pad[i] = ((uint8_t *)indata)[inlen + i];
- else
+ } else {
pad[i] = padbyte;
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))) {
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))) {
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;
}
return false;
}
@@
-228,27
+238,38
@@
bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
gcry_error_t err;
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))) {
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;
}
if(cipher->padding) {
return false;
}
if(cipher->padding) {
- if(!oneshot)
+ if(!oneshot)
{
return false;
return false;
+ }
uint8_t padbyte = ((uint8_t *)outdata)[inlen - 1];
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;
return false;
+ }
size_t origlen = inlen - padbyte;
size_t origlen = inlen - padbyte;
- for(int i = inlen - 1; i >= origlen; i--)
- if(((uint8_t *)indata)[i] != padbyte)
+ for(size_t i = inlen - 1; i >= origlen; i--)
+ if(((uint8_t *)outdata)[i] != padbyte) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: invalid padding");
return false;
return false;
+ }
*outlen = origlen;
*outlen = origlen;
+ } else {
+ *outlen = inlen;
}
return true;
}
return true;