X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Fcipher.c;h=518879bdedbb489cd839430e83a536a24013b292;hb=108b238915c5f58b3d94ab433dc5d04e064c2b11;hp=8920a706aef88a642668de3fbeeeb0c0ca5c3318;hpb=1fd1d5bd9330e02ab5dc32ad027f654ff2620099;p=tinc

diff --git a/src/gcrypt/cipher.c b/src/gcrypt/cipher.c
index 8920a706..518879bd 100644
--- a/src/gcrypt/cipher.c
+++ b/src/gcrypt/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"
@@ -55,7 +53,7 @@ static struct {
 };
 
 static bool nametocipher(const char *name, int *algo, int *mode) {
-	int i;
+	size_t i;
 
 	for(i = 0; i < sizeof ciphertable / sizeof *ciphertable; i++) {
 		if(ciphertable[i].name && !strcasecmp(name, ciphertable[i].name)) {
@@ -69,7 +67,7 @@ static bool nametocipher(const char *name, int *algo, int *mode) {
 }
 
 static bool nidtocipher(int nid, int *algo, int *mode) {
-	int i;
+	size_t i;
 
 	for(i = 0; i < sizeof ciphertable / sizeof *ciphertable; i++) {
 		if(nid == ciphertable[i].nid) {
@@ -83,7 +81,7 @@ static bool nidtocipher(int nid, int *algo, int *mode) {
 }
 
 static bool ciphertonid(int algo, int mode, int *nid) {
-	int i;
+	size_t i;
 
 	for(i = 0; i < sizeof ciphertable / sizeof *ciphertable; i++) {
 		if(algo == ciphertable[i].algo && mode == ciphertable[i].mode) {
@@ -99,12 +97,12 @@ static bool cipher_open(cipher_t *cipher, int algo, int mode) {
 	gcry_error_t err;
 
 	if(!ciphertonid(algo, mode, &cipher->nid)) {
-		logger(LOG_DEBUG, _("Cipher %d mode %d has no corresponding nid!"), algo, mode);
+		logger(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(LOG_DEBUG, "Unable to intialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
 		return false;
 	}
 
@@ -122,7 +120,7 @@ bool cipher_open_by_name(cipher_t *cipher, const char *name) {
 	int algo, mode;
 
 	if(!nametocipher(name, &algo, &mode)) {
-		logger(LOG_DEBUG, _("Unknown cipher name '%s'!"), name);
+		logger(LOG_DEBUG, "Unknown cipher name '%s'!", name);
 		return false;
 	}
 
@@ -133,7 +131,7 @@ bool cipher_open_by_nid(cipher_t *cipher, int nid) {
 	int algo, mode;
 
 	if(!nidtocipher(nid, &algo, &mode)) {
-		logger(LOG_DEBUG, _("Unknown cipher ID %d!"), nid);
+		logger(LOG_DEBUG, "Unknown cipher ID %d!", nid);
 		return false;
 	}
 
@@ -173,7 +171,7 @@ bool cipher_set_key(cipher_t *cipher, void *key, bool encrypt) {
 	return true;
 }
 
-bool cipher_set_key(cipher_t *cipher, void *key, size_t len, bool encrypt) {
+bool cipher_set_key_from_rsa(cipher_t *cipher, void *key, size_t len, bool encrypt) {
 	memcpy(cipher->key, key + len - cipher->keylen, cipher->keylen + cipher->blklen);
 	memcpy(cipher->key + cipher->keylen, key + len - cipher->keylen - cipher->blklen, cipher->blklen);
 
@@ -233,7 +231,7 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
 	// To be fixed
 
 	if((err = gcry_cipher_encrypt(cipher->handle, outdata, inlen, indata, inlen))) {
-		logger(LOG_ERR, _("Error while encrypting: %s"), gcry_strerror(err));
+		logger(LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
 		return false;
 	}
 
@@ -246,7 +244,7 @@ bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
 	// To be fixed
 
 	if((err = gcry_cipher_decrypt(cipher->handle, outdata, inlen, indata, inlen))) {
-		logger(LOG_ERR, _("Error while decrypting: %s"), gcry_strerror(err));
+		logger(LOG_ERR, "Error while decrypting: %s", gcry_strerror(err));
 		return false;
 	}