Merge branch 'master' into 1.1

[tinc] / src / openssl / digest.c

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index e1db934..ff350da 100644 (file)
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.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"
@@ -39,7 +37,7 @@ bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
        digest->digest = EVP_get_digestbyname(name);
 
        if(!digest->digest) {
-               logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name);
+               logger(LOG_DEBUG, "Unknown digest name '%s'!", name);
                return false;
        }
 
@@ -51,7 +49,7 @@ bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
        digest->digest = EVP_get_digestbynid(nid);
 
        if(!digest->digest) {
-               logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid);
+               logger(LOG_DEBUG, "Unknown digest nid %d!", nid);
                return false;
        }
 
@@ -78,7 +76,7 @@ bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
        if(!EVP_DigestInit(&ctx, digest->digest)
                        || !EVP_DigestUpdate(&ctx, indata, inlen)
                        || !EVP_DigestFinal(&ctx, tmpdata, NULL)) {
-               logger(LOG_DEBUG, _("Error creating digest: %s"), ERR_error_string(ERR_get_error(), NULL));
+               logger(LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
                return false;
        }