X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcipher.c;h=743449a33a498f70c7bdf9c37f54c3623ca0d386;hb=3d75dbc0880484ff6d2f689a9b981def3cd75b5e;hp=ccd881953d68528e49ebd9212fa93091bddcad96;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c
index ccd88195..743449a3 100644
--- a/src/openssl/cipher.c
+++ b/src/openssl/cipher.c
@@ -12,11 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -29,11 +27,6 @@
 #include "xalloc.h"
 
 static bool cipher_open(cipher_t *cipher) {
-	cipher->keylen = cipher->cipher->key_len;
-	cipher->blklen = cipher->cipher->iv_len;
-
-	cipher->key = xmalloc(cipher->keylen + cipher->blklen);
-
 	EVP_CIPHER_CTX_init(&cipher->ctx);
 
 	return true;
@@ -45,7 +38,7 @@ bool cipher_open_by_name(cipher_t *cipher, const char *name) {
 	if(cipher->cipher)
 		return cipher_open(cipher);
 
-	logger(LOG_DEBUG, _("Unknown cipher name '%s'!"), name);
+	logger(LOG_ERR, "Unknown cipher name '%s'!", name);
 	return false;
 }
 
@@ -55,7 +48,7 @@ bool cipher_open_by_nid(cipher_t *cipher, int nid) {
 	if(cipher->cipher)
 		return cipher_open(cipher);
 
-	logger(LOG_DEBUG, _("Unknown cipher nid %d!"), nid);
+	logger(LOG_ERR, "Unknown cipher nid %d!", nid);
 	return false;
 }
 
@@ -66,110 +59,81 @@ bool cipher_open_blowfish_ofb(cipher_t *cipher) {
 
 void cipher_close(cipher_t *cipher) {
 	EVP_CIPHER_CTX_cleanup(&cipher->ctx);
-
-	if(cipher->key) {
-		free(cipher->key);
-		cipher->key = NULL;
-	}
 }
 
 size_t cipher_keylength(const cipher_t *cipher) {
-	return cipher->keylen + cipher->blklen;
-}
-
-void cipher_get_key(const cipher_t *cipher, void *key) {
-	memcpy(key, cipher->key, cipher->keylen + cipher->blklen);
+	return cipher->cipher->key_len + cipher->cipher->iv_len;
 }
 
 bool cipher_set_key(cipher_t *cipher, void *key, bool encrypt) {
-	memcpy(cipher->key, key, cipher->keylen + cipher->blklen);
 	bool result;
 
 	if(encrypt)
-		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)cipher->key, (unsigned char *)cipher->key + cipher->keylen);
+		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key, (unsigned char *)key + cipher->cipher->key_len);
 	else
-		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)cipher->key, (unsigned char *)cipher->key + cipher->keylen);
+		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key, (unsigned char *)key + cipher->cipher->key_len);
 
 	if(result)
 		return true;
 
-	logger(LOG_ERR, _("Error while setting key: %s"), ERR_error_string(ERR_get_error(), NULL));
+	logger(LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
 	return false;
 }
 
 bool cipher_set_key_from_rsa(cipher_t *cipher, void *key, size_t len, bool encrypt) {
-	memcpy(cipher->key, key + len - (size_t)cipher->keylen, cipher->keylen);
-	memcpy(cipher->key + cipher->keylen, key + len - (size_t)cipher->keylen - (size_t)cipher->blklen, cipher->blklen);
 	bool result;
 
 	if(encrypt)
-		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)cipher->key, (unsigned char *)cipher->key + cipher->keylen);
+		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key + len - cipher->cipher->key_len, (unsigned char *)key + len - cipher->cipher->iv_len - cipher->cipher->key_len);
 	else
-		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)cipher->key, (unsigned char *)cipher->key + cipher->keylen);
+		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)key + len - cipher->cipher->key_len, (unsigned char *)key + len - cipher->cipher->iv_len - cipher->cipher->key_len);
 
 	if(result)
 		return true;
 
-	logger(LOG_ERR, _("Error while setting key: %s"), ERR_error_string(ERR_get_error(), NULL));
-	return false;
-}
-
-bool cipher_regenerate_key(cipher_t *cipher, bool encrypt) {
-	bool result;
-
-	RAND_pseudo_bytes((unsigned char *)cipher->key, cipher->keylen + cipher->blklen);
-
-	if(encrypt)
-		result = EVP_EncryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)cipher->key, (unsigned char *)cipher->key + cipher->keylen);
-	else
-		result = EVP_DecryptInit_ex(&cipher->ctx, cipher->cipher, NULL, (unsigned char *)cipher->key, (unsigned char *)cipher->key + cipher->keylen);
-
-	if(result)
-		return true;
-	
-	logger(LOG_ERR, _("Error while regenerating key: %s"), ERR_error_string(ERR_get_error(), NULL));
+	logger(LOG_ERR, "Error while setting key: %s", ERR_error_string(ERR_get_error(), NULL));
 	return false;
 }
 
 bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
 	if(oneshot) {
-		int len = *outlen, pad;
+		int len, pad;
 		if(EVP_EncryptInit_ex(&cipher->ctx, NULL, NULL, NULL, NULL)
-				&&EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)
-				&& EVP_EncryptFinal(&cipher->ctx, outdata + len, &pad)) {
-			*outlen = len + pad;
+				&& EVP_EncryptUpdate(&cipher->ctx, (unsigned char *)outdata, &len, indata, inlen)
+				&& EVP_EncryptFinal(&cipher->ctx, (unsigned char *)outdata + len, &pad)) {
+			if(outlen) *outlen = len + pad;
 			return true;
 		}
 	} else {
-		int len = *outlen;
+		int len;
 		if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
-			*outlen = len;
+			if(outlen) *outlen = len;
 			return true;
 		}
 	}
 
-	logger(LOG_ERR, _("Error while encrypting: %s"), ERR_error_string(ERR_get_error(), NULL));
+	logger(LOG_ERR, "Error while encrypting: %s", ERR_error_string(ERR_get_error(), NULL));
 	return false;
 }
 
 bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
 	if(oneshot) {
-		int len = *outlen, pad;
+		int len, pad;
 		if(EVP_DecryptInit_ex(&cipher->ctx, NULL, NULL, NULL, NULL)
-				&& EVP_DecryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)
-				&& EVP_DecryptFinal(&cipher->ctx, outdata + len, &pad)) {
-			*outlen = len + pad;
+				&& EVP_DecryptUpdate(&cipher->ctx, (unsigned char *)outdata, &len, indata, inlen)
+				&& EVP_DecryptFinal(&cipher->ctx, (unsigned char *)outdata + len, &pad)) {
+			if(outlen) *outlen = len + pad;
 			return true;
 		}
 	} else {
-		int len = *outlen;
+		int len;
 		if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
-			*outlen = len;
+			if(outlen) *outlen = len;
 			return true;
 		}
 	}
 
-	logger(LOG_ERR, _("Error while encrypting: %s"), ERR_error_string(ERR_get_error(), NULL));
+	logger(LOG_ERR, "Error while decrypting: %s", ERR_error_string(ERR_get_error(), NULL));
 	return false;
 }