Finish crypto wrapping. Also provide wrappers for OpenSSL.

Disable libgcrypt by default. Since it doesn't support the OFB cipher mode,
we can't use it in a backwards compatible way.

src/openssl/cipher.c

@@ -0,0 +1,182 @@
+/*
+    cipher.c -- Symmetric block cipher handling
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#include "system.h"
+
+#include <openssl/rand.h>
+#include <openssl/err.h>
+
+#include "cipher.h"
+#include "logger.h"
+#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;
+}
+
+bool cipher_open_by_name(cipher_t *cipher, const char *name) {
+	cipher->cipher = EVP_get_cipherbyname(name);
+
+	if(cipher->cipher)
+		return cipher_open(cipher);
+
+	logger(LOG_DEBUG, _("Unknown cipher name '%s'!"), name);
+	return false;
+}
+
+bool cipher_open_by_nid(cipher_t *cipher, int nid) {
+	cipher->cipher = EVP_get_cipherbynid(nid);
+
+	if(cipher->cipher)
+		return cipher_open(cipher);
+
+	logger(LOG_DEBUG, _("Unknown cipher nid %d!"), nid);
+	return false;
+}
+
+bool cipher_open_blowfish_ofb(cipher_t *cipher) {
+	cipher->cipher = EVP_bf_ofb();
+	return cipher_open(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);
+}
+
+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);
+	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 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);
+	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 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));
+	return false;
+}
+
+bool cipher_encrypt(cipher_t *cipher, void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
+	if(oneshot) {
+		int len = *outlen, 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;
+			return true;
+		}
+	} else {
+		int len = *outlen;
+		if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
+			*outlen = len;
+			return true;
+		}
+	}
+
+	logger(LOG_ERR, _("Error while encrypting: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;
+}
+
+bool cipher_decrypt(cipher_t *cipher, void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
+	if(oneshot) {
+		int len = *outlen, 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;
+			return true;
+		}
+	} else {
+		int len = *outlen;
+		if(EVP_EncryptUpdate(&cipher->ctx, outdata, &len, indata, inlen)) {
+			*outlen = len;
+			return true;
+		}
+	}
+
+	logger(LOG_ERR, _("Error while encrypting: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;
+}
+
+int cipher_get_nid(const cipher_t *cipher) {
+	return cipher->cipher ? cipher->cipher->nid : 0;
+}
+
+bool cipher_active(const cipher_t *cipher) {
+	return cipher->cipher && cipher->cipher->nid != 0;
+}

src/openssl/cipher.h

@@ -0,0 +1,49 @@
+/*
+    cipher.h -- header file cipher.c
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#ifndef __TINC_CIPHER_H__
+#define __TINC_CIPHER_H__
+
+#include <openssl/evp.h>
+
+typedef struct cipher {
+	EVP_CIPHER_CTX ctx;
+	const EVP_CIPHER *cipher;
+	char *key;
+	uint16_t keylen;
+	uint16_t blklen;
+} cipher_t;
+
+extern bool cipher_open_by_name(cipher_t *, const char *);
+extern bool cipher_open_by_nid(cipher_t *, int);
+extern bool cipher_open_blowfish_ofb(cipher_t *);
+extern void cipher_close(cipher_t *);
+extern size_t cipher_keylength(const cipher_t *);
+extern void cipher_get_key(const cipher_t *, void *);
+extern bool cipher_set_key(cipher_t *, void *, bool);
+extern bool cipher_set_key_from_rsa(cipher_t *, void *, size_t, bool);
+extern bool cipher_regenerate_key(cipher_t *, bool);
+extern bool cipher_encrypt(cipher_t *, void *indata, size_t inlen, void *outdata, size_t *outlen, bool);
+extern bool cipher_decrypt(cipher_t *, void *indata, size_t inlen, void *outdata, size_t *outlen, bool);
+extern int cipher_get_nid(const cipher_t *);
+extern bool cipher_active(const cipher_t *);
+
+#endif

src/openssl/crypto.c

@@ -0,0 +1,45 @@
+/*
+    crypto.c -- Cryptographic miscellaneous functions and initialisation
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#include "system.h"
+
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/engine.h>
+
+#include "crypto.h"
+
+void crypto_init() {
+        RAND_load_file("/dev/urandom", 1024);
+
+        ENGINE_load_builtin_engines();
+        ENGINE_register_all_complete();
+
+        OpenSSL_add_all_algorithms();
+}
+
+void crypto_exit() {
+	EVP_cleanup();
+}
+
+void randomize(void *out, size_t outlen) {
+	RAND_pseudo_bytes(out, outlen);
+}

src/openssl/crypto.h

@@ -0,0 +1,29 @@
+/*
+    crypto.h -- header for crypto.c
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#ifndef __TINC_CRYPTO_H__
+#define __TINC_CRYPTO_H__
+
+extern void crypto_init();
+extern void crypto_exit();
+extern void randomize(void *, size_t);
+
+#endif

src/openssl/digest.c

@@ -0,0 +1,84 @@
+/*
+    digest.c -- Digest handling
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#include "system.h"
+
+#include <openssl/err.h>
+
+#include "digest.h"
+#include "logger.h"
+
+bool digest_open_by_name(digest_t *digest, const char *name) {
+	digest->digest = EVP_get_digestbyname(name);
+	if(digest->digest)
+		return true;
+
+	logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name);
+	return false;
+}
+
+bool digest_open_by_nid(digest_t *digest, int nid) {
+	digest->digest = EVP_get_digestbynid(nid);
+	if(digest->digest)
+		return true;
+
+	logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid);
+	return false;
+}
+
+bool digest_open_sha1(digest_t *digest) {
+	digest->digest = EVP_sha1();
+	return true;
+}
+
+void digest_close(digest_t *digest) {
+}
+
+bool digest_create(digest_t *digest, void *indata, size_t inlen, void *outdata) {
+	EVP_MD_CTX ctx;
+
+	if(EVP_DigestInit(&ctx, digest->digest)
+			&& EVP_DigestUpdate(&ctx, indata, inlen)
+			&& EVP_DigestFinal(&ctx, outdata, NULL))
+		return true;
+	
+	logger(LOG_DEBUG, _("Error creating digest: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;
+}
+
+bool digest_verify(digest_t *digest, void *indata, size_t inlen, void *cmpdata) {
+	size_t len = EVP_MD_size(digest->digest);
+	char outdata[len];
+
+	return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
+}
+
+int digest_get_nid(const digest_t *digest) {
+	return digest->digest ? digest->digest->type : 0;
+}
+
+size_t digest_length(const digest_t *digest) {
+	return EVP_MD_size(digest->digest);
+}
+
+bool digest_active(const digest_t *digest) {
+	return digest->digest && digest->digest->type != 0;
+}

src/openssl/digest.h

@@ -0,0 +1,41 @@
+/*
+    digest.h -- header file digest.c
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#ifndef __TINC_DIGEST_H__
+#define __TINC_DIGEST_H__
+
+#include <openssl/evp.h>
+
+typedef struct digest {
+	const EVP_MD *digest;
+} digest_t;
+
+extern bool digest_open_by_name(struct digest *, const char *);
+extern bool digest_open_by_nid(struct digest *, int);
+extern bool digest_open_sha1(struct digest *);
+extern void digest_close(struct digest *);
+extern bool digest_create(struct digest *, void *indata, size_t inlen, void *outdata);
+extern bool digest_verify(struct digest *, void *indata, size_t inlen, void *digestdata);
+extern int digest_get_nid(const struct digest *);
+extern size_t digest_length(const struct digest *);
+extern bool digest_active(const struct digest *);
+
+#endif

src/openssl/rsa.c

@@ -0,0 +1,92 @@
+/*
+    rsa.c -- RSA key handling
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#include "system.h"
+
+#include <openssl/pem.h>
+#include <openssl/err.h>
+
+#include "logger.h"
+#include "rsa.h"
+
+// Set RSA keys
+
+bool rsa_set_hex_public_key(rsa_t *rsa, char *n, char *e) {
+	*rsa = RSA_new();
+	BN_hex2bn(&(*rsa)->n, n);
+	BN_hex2bn(&(*rsa)->e, e);
+	return true;
+}
+
+bool rsa_set_hex_private_key(rsa_t *rsa, char *n, char *e, char *d) {
+	*rsa = RSA_new();
+	BN_hex2bn(&(*rsa)->n, n);
+	BN_hex2bn(&(*rsa)->e, e);
+	BN_hex2bn(&(*rsa)->d, d);
+	return true;
+}
+
+// Read PEM RSA keys
+
+bool rsa_read_pem_public_key(rsa_t *rsa, FILE *fp) {
+	*rsa = PEM_read_RSAPublicKey(fp, rsa, NULL, NULL);
+
+	if(*rsa)
+		return true;
+	
+	*rsa = PEM_read_RSA_PUBKEY(fp, rsa, NULL, NULL);
+
+	if(*rsa)
+		return true;
+
+	logger(LOG_ERR, _("Unable to read RSA public key: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;
+}
+
+bool rsa_read_pem_private_key(rsa_t *rsa, FILE *fp) {
+	*rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
+
+	if(*rsa)
+		return true;
+	
+	logger(LOG_ERR, _("Unable to read RSA private key: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;
+}
+
+size_t rsa_size(rsa_t *rsa) {
+	return RSA_size(*rsa);
+}
+
+bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
+	if(RSA_public_encrypt(len, in, out, *rsa, RSA_NO_PADDING) == len)
+		return true;
+
+	logger(LOG_ERR, _("Unable to perform RSA encryption: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;	
+}
+
+bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
+	if(RSA_private_decrypt(len, in, out, *rsa, RSA_NO_PADDING) == len)
+		return true;
+
+	logger(LOG_ERR, _("Unable to perform RSA decryption: %s"), ERR_error_string(ERR_get_error(), NULL));
+	return false;	
+}

src/openssl/rsa.h

@@ -0,0 +1,37 @@
+/*
+    rsa.h -- RSA key handling
+    Copyright (C) 2007 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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$
+*/
+
+#ifndef __TINC_RSA_H__
+#define __TINC_RSA_H__
+
+#include <openssl/rsa.h>
+
+typedef RSA *rsa_t;
+
+extern bool rsa_set_hex_public_key(rsa_t *rsa, char *n, char *e);
+extern bool rsa_set_hex_private_key(rsa_t *rsa, char *n, char *e, char *d);
+extern bool rsa_read_pem_public_key(rsa_t *rsa, FILE *fp);
+extern bool rsa_read_pem_private_key(rsa_t *rsa, FILE *fp);
+extern size_t rsa_size(rsa_t *rsa);
+extern bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t inlen, void *out);
+extern bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t inlen, void *out);
+
+#endif