Merge branch 'master' into 1.1

[tinc] / src / gcrypt / cipher.c

diff --git a/src/gcrypt/cipher.c b/src/gcrypt/cipher.c
index 77add6c..518879b 100644 (file)
--- 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"
@@ -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;
        }
 
@@ -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;
        }