File: debian-changes

package info (click to toggle)
mcrypt 2.6.8-9
links: PTS, VCS
area: main
in suites: forky, sid
size: 2,816 kB
sloc: sh: 10,159; ansic: 6,265; makefile: 38; sed: 16
file content (4104 lines) | stat: -rw-r--r-- 109,947 bytes
parent folder | download | duplicates (2)
Description: Autogenerated patch header for a single-debian-patch file.
 The delta against upstream is either kept as a single patch, or maintained
 in some VCS, and exported as a single patch instead of more manageable
 atomic patches.
Forwarded: not-needed

---
--- /dev/null
+++ mcrypt-2.6.8/configure.ac
@@ -0,0 +1,195 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.71])
+AC_INIT([mcrypt],[2.6.8])
+AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_HEADERS([config.h])
+
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE([foreign -Wall])
+
+AC_DEFINE_UNQUOTED(T_CPU, "$target_cpu", [target CPU])
+AC_DEFINE_UNQUOTED(T_VENDOR, "$target_vendor", [Vendor])
+AC_DEFINE_UNQUOTED(T_OS, "$target_os", [OS])
+
+LT_INIT
+AC_PROG_CC
+
+
+AM_PATH_LIBMCRYPT( 2.5.0,, 
+ AC_MSG_ERROR([[*** libmcrypt was not found]])
+)
+
+AC_CHECK_LIB(mhash, mhash_keygen, LIBS="${LIBS} -lmhash",
+  AC_MSG_ERROR("You need at least libmhash 0.8.15 to compile this program. http://mhash.sf.net/"))
+
+AC_MSG_CHECKING([whether mhash >= 0.8.15])
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <mhash.h>
+
+int main() {
+
+if (MHASH_API_VERSION >= 20020524)
+	exit(0);
+else
+	exit(-1);
+}
+]])],[dnl	************ CASE >= 0.8.15
+AC_MSG_RESULT(yes)
+],[dnl	 ************ CASE < 0.8.15
+AC_MSG_RESULT(no)
+AC_MSG_ERROR("You need at least libmhash 0.8.15 to compile this program. http://mhash.sf.net/")
+],[AC_MSG_RESULT(cross compiling)
+])        
+
+
+dnl For GNU gettext
+ALL_LINGUAS="el cs pl de es_AR sv"
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.21])
+
+ AC_CHECK_LIB(z, compress,,AC_MSG_WARN(
+*** 
+*** ZLIB was not found. You will not be able to use ZLIB compression
+*** in OpenPGP packets.))
+
+LIBS="${LIBS} ${LIBMCRYPT_LIBS}"
+CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall"
+
+
+AC_C_CONST
+
+dnl Checks for programs.
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PATH_PROG(RM,rm)
+
+case "${target}" in
+    *-cygwin*)
+	;;
+    *-mingw*)
+        ;;
+    *)
+	AC_PATH_PROG(GZIP,gzip)
+	AC_DEFINE_UNQUOTED(GZIP, "$GZIP", [gzip pathname])
+	AC_PATH_PROG(BZIP2, bzip2)
+	AC_DEFINE_UNQUOTED(BZIP2, "$BZIP2", [bzip2 pathname])
+        ;;
+esac
+
+dnl AC_PROG_MAKE_SET
+
+dnl From GNUPG
+AC_MSG_CHECKING([whether use of /dev/random is requested])
+AC_ARG_ENABLE(dev-random,
+[  --disable-dev-random    disable the use of dev random],
+    try_dev_random=$enableval, try_dev_random=yes)
+AC_MSG_RESULT($try_dev_random)
+
+
+opt_static_link=no
+AC_MSG_CHECKING([whether static link is requested])
+AC_ARG_ENABLE(static-link,
+[  --enable-static-link    link mcrypt statically (libmcrypt must also be a static library))],
+opt_static_link=$enableval)
+AC_MSG_RESULT($opt_static_link)
+
+opt_maintainer_mode=no
+AC_MSG_CHECKING([whether in maintanance mode])
+AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable maintainer mode],
+opt_maintainer_mode=$enableval)
+AC_MSG_RESULT($opt_maintainer_mode)
+
+
+AC_MSG_CHECKING([whether included getpass is requested])
+AC_ARG_ENABLE(included-getpass,
+[  --disable-included-getpass disable-included-getpass],
+    try_getpass=$enableval, try_getpass=yes)
+AC_MSG_RESULT($try_getpass)
+
+if test "$try_getpass" != yes ; then
+ AC_DEFINE(NO_GETPASS, 1, [whether getpass was requested])
+fi
+
+case "${target}" in
+    *-openbsd*)
+        NAME_OF_DEV_RANDOM="/dev/srandom"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+        ;;
+    *-cygwin*)
+	AC_DEFINE(WIN32, 1, [win32])
+        NAME_OF_DEV_RANDOM=""
+        NAME_OF_DEV_URANDOM=""
+	;;
+    *-mingw*)
+	AC_DEFINE(WIN32, 1, [win32])
+        NAME_OF_DEV_RANDOM=""
+        NAME_OF_DEV_URANDOM=""
+        ;;
+    *)
+        NAME_OF_DEV_RANDOM="/dev/random"
+        NAME_OF_DEV_URANDOM="/dev/urandom"
+        ;;
+esac
+
+AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM", [path of random])
+AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM", [path of urandom])
+
+dnl check whether we have a random device
+if test "$try_dev_random" = yes ; then
+AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
+[if test -c "/dev/random" && test -c "$NAME_OF_DEV_URANDOM" ; then
+  ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
+if test "$ac_cv_have_dev_random" = yes; then
+    AC_DEFINE(HAVE_DEV_RANDOM, 1, [whether /dev/random exists])
+else
+    AC_MSG_WARN(No random device found. No real random data can be used.)
+fi
+else
+    AC_MSG_CHECKING(for random device)
+    ac_cv_have_dev_random=no
+    AC_MSG_RESULT(has been disabled)
+    AC_MSG_WARN(Support for random device was disabled. No real random data can be used.)
+fi
+
+
+if test $ac_cv_c_compiler_gnu = yes; then
+
+	if test $opt_maintainer_mode = yes; then
+	  CFLAGS=" -Wall -Wpointer-arith -O0 -ggdb3"
+	fi
+fi
+
+if test "$opt_static_link" = yes; then
+ 	if test -n "$GCC" || test "$ac_cv_c_compiler_gnu" = "yes"; then
+ 		LDFLAGS="-static $LDFLAGS"
+ 	fi
+fi
+
+AC_C_BIGENDIAN
+
+AC_CHECK_SIZEOF(unsigned long int, 4)
+AC_CHECK_SIZEOF(unsigned int, 4)
+AC_CHECK_SIZEOF(unsigned short int, 2)
+AC_CHECK_SIZEOF(unsigned char, 1)
+
+AC_CHECK_TYPE( off_t, 
+  AC_DEFINE( HAVE_OFF_T, 1, [have off_t type]),,
+)
+
+AC_SYS_LARGEFILE
+
+AC_CHECK_HEADERS(unistd.h pwd.h locale.h strings.h mcrypt.h ctype.h)
+AC_CHECK_HEADERS(sys/stat.h sys/types.h fcntl.h sys/wait.h)
+AC_CHECK_HEADERS(utime.h signal.h)
+AC_CHECK_HEADERS(termios.h termio.h sgtty.h)
+AC_CHECK_FUNCS(bzero signal sigaction memset fsync siglongjmp strlcpy,,)
+AC_CHECK_FUNCS(umask utime memmove bcopy getpwuid waitpid kill ftime,,)
+AC_CHECK_FUNCS(lstat stat fseeko,,)
+
+
+AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile po/Makefile.in])
+AC_CONFIG_COMMANDS([default],[[]],[[]])
+AC_OUTPUT
--- mcrypt-2.6.8.orig/doc/mcrypt.1
+++ mcrypt-2.6.8/doc/mcrypt.1
@@ -1,7 +1,6 @@
-.PU
 .TH MCRYPT 1 "03 May 2003" "local"
 .SH NAME
-mcrypt, mdecrypt \- encrypt or decrypt files
+crypt, mcrypt, mdecrypt \- encrypt or decrypt files
 .SH SYNOPSIS
 .ll +8
 .B mcrypt
@@ -49,6 +48,11 @@ output.
 .I Mcrypt
 uses all the symmetric algorithms included in libmcrypt.
 
+.I crypt
+is a small shell wrapper around
+.I mcrypt
+to emulate the old unix crypt command.  For more information run crypt --help !
+
 .SH HINTS
 By default,
 .I mcrypt
@@ -81,7 +85,7 @@ two blocks in CBC and CFB modes, but onl
 Mcrypt uses a 32 bit CRC to check for errors in the encrypted files.
 .PP
 .B Extra security:
-For the very paranoid, if mcrypt is executed with superuser priviledges it
+For the very paranoid, if mcrypt is executed with superuser privileges it
 ensures that no important data (keys etc.) are written to disk, as swap etc.
 Keep in mind that mcrypt was not designed to be a setuid program, so you
 shouldn't make it one.
@@ -165,11 +169,11 @@ license and quit.
 .TP
 .B \-o --keymode MODE
 MODE may be one of the keymodes listed by the --list-keymodes parameter.
-It actually is the convertion to the key before it is fed to the algorithm.
+It actually is the conversion to the key before it is fed to the algorithm.
 It is recommended to leave it as is, if you do not know what it is.
 However if you still want to use this option, you might want to
 use the 'hex' mode which allows you to specify the key in hex
-(and no convertion will by applied).
+(and no conversion will by applied).
 .TP
 .B \-h --hash HASH_ALGORITHM
 HASH_ALGORITHM may be one of the algorithms listed by the --list-hash parameter.
@@ -194,10 +198,10 @@ The security lies on the algorithm not o
 default. This flag must also be specified when decrypting a bare encrypted 
 file. 
 When the bare flag is specified decryption and encryption are faster. This
-may be usefull when using mcrypt to encrypt a link or something like that.
+may be useful when using mcrypt to encrypt a link or something like that.
 .TP
 .B --flush
-Flushes the output (ciphertext or plaintext) immediately. Usefull if mcrypt
+Flushes the output (ciphertext or plaintext) immediately. Useful if mcrypt
 is used with pipes.
 .TP
 .B --time
@@ -205,7 +209,7 @@ Prints some timing information (encrypti
 .TP
 .B --nodelete
 When this option is specified mcrypt does not delete the output file, even
-if decryption failed. This is usefull if you want to decrypt a corrupted
+if decryption failed. This is useful if you want to decrypt a corrupted
 file.
 .TP
 .B \-q --quiet
@@ -217,13 +221,13 @@ succeeds. This is not the default in ord
 to remove sensitive data.
 .TP
 .B \ --list
-Lists all the algorithms current supported.
+Lists all the algorithms currently supported.
 .TP
-.B \ --list-keymodes
-Lists all the key modes current supported.
+.B \ --list-keymodes 
+Lists all the key modes currently supported.
 .TP
 .B \ --list-hash
-Lists all the hash algorithms current supported.
+Lists all the hash algorithms currently supported.
 .TP
 .B \-r --random
 Use /dev/(s)random instead of /dev/urandom. This may need some key input
@@ -299,9 +303,7 @@ You can use these instead of using the c
 but note that only one key should be used in MCRYPT_KEY.
 .PP
 .SH "SEE ALSO"
-.BR crypt (1),
-.BR des (1)
-.BR mcrypt (3)
+.BR des_crypt (3)
 .SH "DIAGNOSTICS"
 Exit status is normally 0;
 if an error occurs, exit status is something other than 0. 
--- mcrypt-2.6.8.orig/po/cs.po
+++ mcrypt-2.6.8/po/cs.po
@@ -10,44 +10,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mcrypt 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 22:09+0200\n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
 "PO-Revision-Date:  2000-10-12 12:12+0200\n"
 "Last-Translator: Petr Blha <pblaha@suse.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/extra.c:99
+#: src/extra.c:96
 #, c-format
 msgid "Keywords do not match or they are too long.\n"
 msgstr "Klov slova nesouhlas a nebo jsou moc dlouh.\n"
 
-#: src/extra.c:114
+#: src/extra.c:111
 #, c-format
 msgid "Enter passphrase: "
 msgstr "Zadejte klovac frzi: "
 
-#: src/extra.c:119
+#: src/extra.c:116
 #, c-format
 msgid "Enter the passphrase (maximum of %d characters)\n"
 msgstr "Zadejte klovac frzi (maximum je %d znak)\n"
 
-#: src/extra.c:123
+#: src/extra.c:120
 #, c-format
 msgid "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr "Pouijte prosm kombinaci velkch, malch psmen a sel.\n"
 
-#: src/extra.c:190 src/extra.c:195 src/extra.c:200 src/extra.c:205
-#: src/extra.c:210 src/extra.c:215
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
 msgid "Unsupported version of encrypted file\n"
 msgstr "Nepodporovan verze zaifrovanho souboru\n"
 
-#: src/extra.c:221
+#: src/extra.c:218
 msgid "No Initialization vector was used.\n"
 msgstr "Inicializan vektor nebyl pouit.\n"
 
-#: src/extra.c:261
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
 msgid ""
 "This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -55,7 +60,7 @@ msgstr ""
 "Toto je soubor zaifrovan programem mcrypt verze 2.2Bohuel budete "
 "potebovat toto verzi pro deifrovn.\n"
 
-#: src/extra.c:266
+#: src/extra.c:268
 msgid ""
 "This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -63,20 +68,20 @@ msgstr ""
 "Toto je soubor zaifrovan programem mcrypt verze 2.1Bohuel budete "
 "potebovat toto verzi pro deifrovn.\n"
 
-#: src/extra.c:270
+#: src/extra.c:272
 msgid ""
 "Unable to get algorithm information. Use the --bare flag and specify the "
-"algorithm manualy.\n"
+"algorithm manually.\n"
 msgstr ""
 "Nemohu zskat informaci o algoritmu. Pouij pznak --bare a specifikuj "
 "algoritmus manuln.\n"
 
-#: src/extra.c:452
+#: src/extra.c:454
 #, c-format
 msgid "Signal %d caught. Exiting.\n"
 msgstr "Zachycen signl %d. Konm.\n"
 
-#: src/extra.c:464
+#: src/extra.c:466
 #, c-format
 msgid ""
 "\n"
@@ -85,30 +90,30 @@ msgstr ""
 "\n"
 "Zachycen signl %d. Konm.\n"
 
-#: src/extra.c:490
+#: src/extra.c:492
 #, c-format
 msgid "Keyfile could not be opened. Ignoring it.\n"
 msgstr "Nelze otevt klov soubor. Ignoruji.\n"
 
-#: src/extra.c:553
+#: src/extra.c:555
 #, c-format
 msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
 msgstr "%s: %s ji existuje; pepsat (y or n)?"
 
-#: src/extra.c:615
+#: src/extra.c:617
 msgid "Could not push character back to stream\n"
 msgstr ""
 
-#: src/extra.c:623
+#: src/extra.c:625
 #, fuzzy
 msgid "Could not open file\n"
 msgstr "Mcrypt neme otevt modul.\n"
 
-#: src/extra.c:636
+#: src/extra.c:638
 msgid "An OpenPGP encrypted file has been detected.\n"
 msgstr ""
 
-#: src/extra.c:651
+#: src/extra.c:653
 #, c-format
 msgid ""
 "Algorithm: %s\n"
@@ -121,66 +126,66 @@ msgstr ""
 "Md: %s\n"
 "klovac md: %s\n"
 
-#: src/extra.c:659
+#: src/extra.c:661
 #, c-format
 msgid "File format: %s\n"
 msgstr ""
 
-#: src/extra.c:664
+#: src/extra.c:666
 #, fuzzy, c-format
 msgid "Input File: %s\n"
 msgstr "Soubor:  %s\n"
 
-#: src/extra.c:667
+#: src/extra.c:669
 #, fuzzy, c-format
 msgid "Output File: %s\n"
 msgstr "Soubor:  %s\n"
 
-#: src/extra.c:712
+#: src/extra.c:714
 #, c-format
 msgid "Time needed: "
 msgstr ""
 
-#: src/extra.c:715
+#: src/extra.c:717
 #, c-format
 msgid "%lu hours"
 msgstr ""
 
-#: src/extra.c:722
+#: src/extra.c:724
 #, c-format
 msgid "%lu minutes"
 msgstr ""
 
-#: src/extra.c:729
+#: src/extra.c:731
 #, c-format
 msgid "%lu seconds"
 msgstr ""
 
-#: src/extra.c:736
+#: src/extra.c:738
 #, c-format
 msgid "%lu milliseconds"
 msgstr ""
 
-#: src/extra.c:741
+#: src/extra.c:743
 #, c-format
 msgid "Wow, no time counted!\n"
 msgstr ""
 
-#: src/extra.c:748
+#: src/extra.c:750
 #, c-format
 msgid ""
 "Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
 "\n"
 msgstr ""
 
-#: src/extra.c:755
+#: src/extra.c:757
 #, c-format
 msgid ""
 "Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:80
+#: src/mcrypt.c:79
 #, c-format
 msgid ""
 "\n"
@@ -188,7 +193,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:90
+#: src/mcrypt.c:89
 #, c-format
 msgid ""
 "\n"
@@ -209,41 +214,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:133
+#: src/mcrypt.c:132
 #, c-format
 msgid "Mcrypt v.%s (%s-%s-%s)\n"
 msgstr ""
 
-#: src/mcrypt.c:135
+#: src/mcrypt.c:134
 #, c-format
 msgid "Linked against libmcrypt v.%s\n"
 msgstr "Slinkovno proti libmcrypt v.%s\n"
 
-#: src/mcrypt.c:139
+#: src/mcrypt.c:138
 #, c-format
 msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
 msgstr ""
 
-#: src/mcrypt.c:152
+#: src/mcrypt.c:151
 msgid "The specified key size is too large for this algorithm.\n"
 msgstr "Uren velikost kle je pli dlouh pro tento algoritmus.\n"
 
-#: src/mcrypt.c:177
+#: src/mcrypt.c:176
 msgid "The specified key size not valid for this algorithm.\n"
 msgstr "Uren kl nen platn pro tento algoritmus.\n"
 
-#: src/mcrypt.c:214 src/mcrypt.c:266
+#: src/mcrypt.c:213 src/mcrypt.c:265
 #, fuzzy
 msgid "Error in the arguments. Use the --help parameter for more info.\n"
 msgstr ""
 "Pesmruj vstup.\n"
 "Pouij parametr --help pro lep vysvtlen.\n"
 
-#: src/mcrypt.c:219
+#: src/mcrypt.c:218
 msgid "Warning: Cannot access config file.\n"
 msgstr "Varovn: Nemm pstup ke konfiguranmu souboru.\n"
 
-#: src/mcrypt.c:235
+#: src/mcrypt.c:234
 #, fuzzy
 msgid ""
 "Error in the configuration file. Use the --help parameter for more info.\n"
@@ -251,52 +256,52 @@ msgstr ""
 "Pesmruj vstup.\n"
 "Pouij parametr --help pro lep vysvtlen.\n"
 
-#: src/mcrypt.c:336
+#: src/mcrypt.c:335
 #, c-format
 msgid "The '%s' hash algorithm was not found.\n"
 msgstr "Haovac Algoritmus  '%s' nebyl nalezen.\n"
 
-#: src/mcrypt.c:339
+#: src/mcrypt.c:338
 #, c-format
 msgid "Use the --hashlist parameter to view all supported hashes.\n"
 msgstr "Pouij parametr --hashlist pro vpis podporovch he.\n"
 
-#: src/mcrypt.c:379
+#: src/mcrypt.c:378
 msgid "Illegal compression level\n"
 msgstr ""
 
-#: src/mcrypt.c:392
+#: src/mcrypt.c:391
 #, c-format
 msgid "Error in algorithm '%s'.\n"
 msgstr "Chyba v algoritmu '%s'.\n"
 
-#: src/mcrypt.c:401 src/mcrypt.c:413
+#: src/mcrypt.c:400 src/mcrypt.c:412
 #, c-format
 msgid "Error in mode '%s'.\n"
 msgstr "Chyba v mdu  '%s'.\n"
 
-#: src/mcrypt.c:427
+#: src/mcrypt.c:426
 msgid "Warning: It is insecure to specify keywords in the command line\n"
 msgstr ""
 "Varovn: Nen bezpen specifikovat klov slova na pkazov dce\n"
 
-#: src/mcrypt.c:436
+#: src/mcrypt.c:435
 msgid ""
 "Warning: This system does not have a random device. Will use the included "
 "entropy gatherer.\n"
 msgstr ""
 
-#: src/mcrypt.c:487
+#: src/mcrypt.c:486
 #, c-format
 msgid "%s: %s is not a regular file. Skipping...\n"
 msgstr "%s: %s nen regulrn soubor. Peskakuji...\n"
 
-#: src/mcrypt.c:506
+#: src/mcrypt.c:505
 #, c-format
 msgid "%s: Encrypted data will not be read from a terminal.\n"
 msgstr "%s: Zaifrovan data nebudou tena z terminlu.\n"
 
-#: src/mcrypt.c:510
+#: src/mcrypt.c:509
 msgid ""
 "Redirect the input instead.\n"
 "Use the --help parameter for more help.\n"
@@ -304,12 +309,12 @@ msgstr ""
 "Pesmruj vstup.\n"
 "Pouij parametr --help pro lep vysvtlen.\n"
 
-#: src/mcrypt.c:525
+#: src/mcrypt.c:524
 #, c-format
 msgid "%s: Encrypted data will not be written to a terminal.\n"
 msgstr "%s: Zaifrovan data nebudou zapsna na terminl.\n"
 
-#: src/mcrypt.c:529
+#: src/mcrypt.c:528
 msgid ""
 "Redirect the output instead.\n"
 "Use the --help parameter for more help.\n"
@@ -317,59 +322,59 @@ msgstr ""
 "Pesmruj vstup.\n"
 "Pouij parametr --help pro lep vysvtlen.\n"
 
-#: src/mcrypt.c:549
+#: src/mcrypt.c:548
 #, c-format
 msgid "%s: file %s has the .nc suffix... skipping...\n"
 msgstr "%s: soubor %s m pponu .nc  peskakuji...\n"
 
-#: src/mcrypt.c:593
+#: src/mcrypt.c:592
 #, c-format
 msgid "File %s was decrypted.\n"
 msgstr "Soubor %s byl deifrovn.\n"
 
-#: src/mcrypt.c:596
+#: src/mcrypt.c:595
 #, c-format
 msgid "Stdin was decrypted.\n"
 msgstr "Stdin (standartn vstup)  byl deifrovn\n"
 
-#: src/mcrypt.c:615
+#: src/mcrypt.c:614
 #, c-format
 msgid "File %s was NOT decrypted successfully.\n"
 msgstr "Soubor %s NEBYL spn deifrovn.\n"
 
-#: src/mcrypt.c:625
+#: src/mcrypt.c:624
 msgid "Stdin was NOT decrypted successfully.\n"
 msgstr "Stdin (standartn vstup) NEBYL spn deifrovn.\n"
 
-#: src/mcrypt.c:639
+#: src/mcrypt.c:638
 #, c-format
 msgid "File %s was encrypted.\n"
 msgstr "Soubor %s byl zaifrovn\n"
 
-#: src/mcrypt.c:642
+#: src/mcrypt.c:641
 #, c-format
 msgid "Stdin was encrypted.\n"
 msgstr "Stdin (standartn vstup) byl zaifrovn\n"
 
-#: src/mcrypt.c:660
+#: src/mcrypt.c:659
 #, c-format
 msgid "File %s was NOT encrypted successfully.\n"
 msgstr "Soubor %s NEBYL spn zaifrovn.\n"
 
-#: src/mcrypt.c:670
+#: src/mcrypt.c:669
 msgid "Stdin was NOT encrypted successfully.\n"
 msgstr "Stdin (standartn vstup) NEBYL spn zaifrovn.\n"
 
-#: src/mcrypt.c:732
+#: src/mcrypt.c:731
 msgid "Unknown suffix. Will append '.dc'.\n"
 msgstr ""
 
-#: src/keys.c:133
+#: src/keys.c:131
 msgid "Key transformation failed.\n"
 msgstr "Transformace  kle selhala.\n"
 
-#: src/xmalloc.c:37 src/xmalloc.c:55 src/xmalloc.c:72 src/xmalloc.c:91
-#: src/xmalloc.c:107 src/xmalloc.c:124 src/xmalloc.c:146
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
 #, c-format
 msgid "Cannot allocate memory\n"
 msgstr "Nemohu alokovat pam\n"
@@ -687,20 +692,20 @@ msgstr ""
 msgid "could not fdopen child stdout pipe!\n"
 msgstr ""
 
-#: src/random.c:94
+#: src/random.c:92
 msgid "mhash_init() failed."
 msgstr ""
 
-#: src/random.c:124
+#: src/random.c:122
 msgid "Error while reading random data\n"
 msgstr ""
 
-#: src/random.c:148 src/classic.c:118 src/classic.c:533
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
 #, fuzzy
 msgid "Mcrypt failed to open module.\n"
 msgstr "Mcrypt neme otevt modul.\n"
 
-#: src/random.c:151
+#: src/random.c:149
 msgid "Mcrypt failed to initialize cipher.\n"
 msgstr ""
 
--- mcrypt-2.6.8.orig/po/de.po
+++ mcrypt-2.6.8/po/de.po
@@ -6,46 +6,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mcrypt 2.5.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 22:09+0200\n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
 "PO-Revision-Date: 2002-05-15 08:10+0200\n"
 "Last-Translator: Timo Schulz <ts@winpt.org>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/extra.c:99
+#: src/extra.c:96
 #, c-format
 msgid "Keywords do not match or they are too long.\n"
 msgstr "Das Mantra stimmt nicht berein oder ist zu lang.\n"
 
-#: src/extra.c:114
+#: src/extra.c:111
 #, c-format
 msgid "Enter passphrase: "
 msgstr "Mantra eingeben: "
 
-#: src/extra.c:119
+#: src/extra.c:116
 #, c-format
 msgid "Enter the passphrase (maximum of %d characters)\n"
 msgstr "Bitte Mantra eingeben (Maximum %d Zeichen)\n"
 
-#: src/extra.c:123
+#: src/extra.c:120
 #, c-format
 msgid "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
-"Bitte benutzen Sie eine Kombination von Klein- und Grossbuchstaben, sowie "
+"Bitte benutzen Sie eine Kombination von Klein- und Grobuchstaben, sowie "
 "Nummern.\n"
 
-#: src/extra.c:190 src/extra.c:195 src/extra.c:200 src/extra.c:205
-#: src/extra.c:210 src/extra.c:215
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
 msgid "Unsupported version of encrypted file\n"
 msgstr "Nicht untersttze Version der verschlsselten Datei\n"
 
-#: src/extra.c:221
+#: src/extra.c:218
 msgid "No Initialization vector was used.\n"
 msgstr "Kein Initialisierungsvektor wurde verwendet.\n"
 
-#: src/extra.c:261
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
 msgid ""
 "This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -53,7 +58,7 @@ msgstr ""
 "Diese Datei wurde mit mcrypt 2.2 verschlsselt. Leider bentigen Sie auch "
 "diese Version um sie wieder zu entschlsseln.\n"
 
-#: src/extra.c:266
+#: src/extra.c:268
 msgid ""
 "This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -61,20 +66,20 @@ msgstr ""
 "Diese Datei wurde mit mcrypt 2.1 verschlsselt. Leider bentigen Sie auch "
 "diese Version um sie wieder zu entschlsseln.\n"
 
-#: src/extra.c:270
+#: src/extra.c:272
 msgid ""
 "Unable to get algorithm information. Use the --bare flag and specify the "
-"algorithm manualy.\n"
+"algorithm manually.\n"
 msgstr ""
 "Konnte die Informationen zum Algorithmus nicht extrahieren. Benutzen Sie die "
 "--bare Option und geben Sie den Algorithmus manuell ein.\n"
 
-#: src/extra.c:452
+#: src/extra.c:454
 #, c-format
 msgid "Signal %d caught. Exiting.\n"
 msgstr "Signal %d aufgefangen. Beendet.\n"
 
-#: src/extra.c:464
+#: src/extra.c:466
 #, c-format
 msgid ""
 "\n"
@@ -83,31 +88,31 @@ msgstr ""
 "\n"
 "Signal %d aufgefangen. Beendet.\n"
 
-#: src/extra.c:490
+#: src/extra.c:492
 #, c-format
 msgid "Keyfile could not be opened. Ignoring it.\n"
 msgstr "Schlsseldatei konnte nicht geffnet werden. Sie wird ignoriert.\n"
 
-#: src/extra.c:553
+#: src/extra.c:555
 #, c-format
 msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
 msgstr ""
 "%s: %s: existiert schon; Wollen Sie das sie berschrieben wird (y oder n)?"
 
-#: src/extra.c:615
+#: src/extra.c:617
 msgid "Could not push character back to stream\n"
 msgstr ""
 
-#: src/extra.c:623
+#: src/extra.c:625
 #, fuzzy
 msgid "Could not open file\n"
 msgstr "Mcrypt konnte das Modul nicht ffnen.\n"
 
-#: src/extra.c:636
+#: src/extra.c:638
 msgid "An OpenPGP encrypted file has been detected.\n"
 msgstr ""
 
-#: src/extra.c:651
+#: src/extra.c:653
 #, c-format
 msgid ""
 "Algorithm: %s\n"
@@ -120,52 +125,52 @@ msgstr ""
 "Modus: %s\n"
 "Keyword Modus: %s\n"
 
-#: src/extra.c:659
+#: src/extra.c:661
 #, c-format
 msgid "File format: %s\n"
 msgstr "Datei Format: %s\n"
 
-#: src/extra.c:664
+#: src/extra.c:666
 #, c-format
 msgid "Input File: %s\n"
 msgstr "Eingabedatei: %s\n"
 
-#: src/extra.c:667
+#: src/extra.c:669
 #, c-format
 msgid "Output File: %s\n"
 msgstr "Ausgabedatei: %s\n"
 
-#: src/extra.c:712
+#: src/extra.c:714
 #, c-format
 msgid "Time needed: "
 msgstr "Bentige Zeit: "
 
-#: src/extra.c:715
+#: src/extra.c:717
 #, c-format
 msgid "%lu hours"
 msgstr "%lu Stunden"
 
-#: src/extra.c:722
+#: src/extra.c:724
 #, c-format
 msgid "%lu minutes"
 msgstr "%lu Minuten"
 
-#: src/extra.c:729
+#: src/extra.c:731
 #, c-format
 msgid "%lu seconds"
 msgstr "%lu Sekunden"
 
-#: src/extra.c:736
+#: src/extra.c:738
 #, c-format
 msgid "%lu milliseconds"
 msgstr "%lu Millisekunden"
 
-#: src/extra.c:741
+#: src/extra.c:743
 #, c-format
 msgid "Wow, no time counted!\n"
 msgstr "Wow, es wurde keine Zeit gemessen!\n"
 
-#: src/extra.c:748
+#: src/extra.c:750
 #, c-format
 msgid ""
 "Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
@@ -174,7 +179,7 @@ msgstr ""
 "Verschlsselte %.3f MB, mit einer Rate von %.3f MB/sec (1 MB == 1000000 "
 "Bytes).\n"
 
-#: src/extra.c:755
+#: src/extra.c:757
 #, c-format
 msgid ""
 "Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
@@ -183,7 +188,7 @@ msgstr ""
 "Verschlsselte %.3f KB, mit einer Rate von %.3f MB/sec (1 KB == 1000 "
 "Bytes).\n"
 
-#: src/mcrypt.c:80
+#: src/mcrypt.c:79
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +199,7 @@ msgstr ""
 "Bitte senden sie Fehlerberichte an mcrypt-dev@lists.hellug.gr.\n"
 
 #
-#: src/mcrypt.c:90
+#: src/mcrypt.c:89
 #, c-format
 msgid ""
 "\n"
@@ -233,93 +238,93 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, "
 "USA.\n"
 
-#: src/mcrypt.c:133
+#: src/mcrypt.c:132
 #, c-format
 msgid "Mcrypt v.%s (%s-%s-%s)\n"
 msgstr "Mcrypt v.%s (%s-%s-%s)\n"
 
-#: src/mcrypt.c:135
+#: src/mcrypt.c:134
 #, c-format
 msgid "Linked against libmcrypt v.%s\n"
 msgstr "Gelinkt gegen libmcrypt v.%s\n"
 
-#: src/mcrypt.c:139
+#: src/mcrypt.c:138
 #, c-format
 msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
 msgstr "Copyright (C) 1998-2001 Nikos Mavroyanopoulos (nmav@hellug.gr)\n"
 
-#: src/mcrypt.c:152
+#: src/mcrypt.c:151
 msgid "The specified key size is too large for this algorithm.\n"
 msgstr "Die angegebene Schlssellnge ist zu lang fr diesen Algorithmus.\n"
 
-#: src/mcrypt.c:177
+#: src/mcrypt.c:176
 msgid "The specified key size not valid for this algorithm.\n"
 msgstr ""
 "Die angegebene Schlssellnge ist nicht gltig fr diesen Algorithmus.\n"
 
-#: src/mcrypt.c:214 src/mcrypt.c:266
+#: src/mcrypt.c:213 src/mcrypt.c:265
 msgid "Error in the arguments. Use the --help parameter for more info.\n"
 msgstr ""
 "Fehler in den Argumenten. Benutzen Sie --help fr mehr Informationen.\n"
 
-#: src/mcrypt.c:219
+#: src/mcrypt.c:218
 msgid "Warning: Cannot access config file.\n"
 msgstr "Warnung: Konnte auf die Konfigdatei nicht zugreifen.\n"
 
-#: src/mcrypt.c:235
+#: src/mcrypt.c:234
 msgid ""
 "Error in the configuration file. Use the --help parameter for more info.\n"
 msgstr ""
 "Fehler in der Konfigdatei. Benutzen Sie --help fr mehr Informationen.\n"
 
-#: src/mcrypt.c:336
+#: src/mcrypt.c:335
 #, c-format
 msgid "The '%s' hash algorithm was not found.\n"
 msgstr "Der '%s' Hash-Algorithmus wurde nicht gefunden.\n"
 
-#: src/mcrypt.c:339
+#: src/mcrypt.c:338
 #, c-format
 msgid "Use the --hashlist parameter to view all supported hashes.\n"
 msgstr ""
 "Benutzen Sie den --hashlist Parameter um alle untersttzen Hash-Algorithmen "
 "aufzulisten.\n"
 
-#: src/mcrypt.c:379
+#: src/mcrypt.c:378
 msgid "Illegal compression level\n"
 msgstr ""
 
-#: src/mcrypt.c:392
+#: src/mcrypt.c:391
 #, c-format
 msgid "Error in algorithm '%s'.\n"
 msgstr "Fehler in Algorithmus '%s'.\n"
 
-#: src/mcrypt.c:401 src/mcrypt.c:413
+#: src/mcrypt.c:400 src/mcrypt.c:412
 #, c-format
 msgid "Error in mode '%s'.\n"
 msgstr "Fehler in Modus '%s'.\n"
 
-#: src/mcrypt.c:427
+#: src/mcrypt.c:426
 msgid "Warning: It is insecure to specify keywords in the command line\n"
 msgstr ""
 "Warnung: Es ist unsicher Schlsselwrter auf der Kommandozeile festzulegen\n"
 
-#: src/mcrypt.c:436
+#: src/mcrypt.c:435
 msgid ""
 "Warning: This system does not have a random device. Will use the included "
 "entropy gatherer.\n"
 msgstr "Warnung: Dieses System untersttzt keine richtigen Zufallsdaten.\n"
 
-#: src/mcrypt.c:487
+#: src/mcrypt.c:486
 #, c-format
 msgid "%s: %s is not a regular file. Skipping...\n"
 msgstr "%s: %s ist keine regulre Datei. Sie wird bersprungen...\n"
 
-#: src/mcrypt.c:506
+#: src/mcrypt.c:505
 #, c-format
 msgid "%s: Encrypted data will not be read from a terminal.\n"
 msgstr "%s: Verschlsselte Daten werden nicht vom Terminal gelesen.\n"
 
-#: src/mcrypt.c:510
+#: src/mcrypt.c:509
 msgid ""
 "Redirect the input instead.\n"
 "Use the --help parameter for more help.\n"
@@ -327,12 +332,12 @@ msgstr ""
 "Leiten Sie die Eingabe stattdessen um.\n"
 "Benutzen Sie --help fr mehr Informationen.\n"
 
-#: src/mcrypt.c:525
+#: src/mcrypt.c:524
 #, c-format
 msgid "%s: Encrypted data will not be written to a terminal.\n"
 msgstr "%s: Verschlsselte Daten werden nicht auf das Terminal geschrieben.\n"
 
-#: src/mcrypt.c:529
+#: src/mcrypt.c:528
 msgid ""
 "Redirect the output instead.\n"
 "Use the --help parameter for more help.\n"
@@ -340,59 +345,59 @@ msgstr ""
 "Leiten Sie die Ausgabe stattdessen um.\n"
 "Benutzen Sie --help fr mehr Informationen.\n"
 
-#: src/mcrypt.c:549
+#: src/mcrypt.c:548
 #, c-format
 msgid "%s: file %s has the .nc suffix... skipping...\n"
 msgstr "%s: Datei %s hat das .nc Suffix... Ausgelassen...\n"
 
-#: src/mcrypt.c:593
+#: src/mcrypt.c:592
 #, c-format
 msgid "File %s was decrypted.\n"
 msgstr "Datei %s wurde entschlsselt.\n"
 
-#: src/mcrypt.c:596
+#: src/mcrypt.c:595
 #, c-format
 msgid "Stdin was decrypted.\n"
 msgstr "Stdin wurde entschlsselt.\n"
 
-#: src/mcrypt.c:615
+#: src/mcrypt.c:614
 #, c-format
 msgid "File %s was NOT decrypted successfully.\n"
 msgstr "Datei %s wurde NICHT erfolgreich entschlsselt.\n"
 
-#: src/mcrypt.c:625
+#: src/mcrypt.c:624
 msgid "Stdin was NOT decrypted successfully.\n"
 msgstr "Stdin wurde NICHT erfolgreich entschlsselt.\n"
 
-#: src/mcrypt.c:639
+#: src/mcrypt.c:638
 #, c-format
 msgid "File %s was encrypted.\n"
 msgstr "Datei %s wurde verschlsselt.\n"
 
-#: src/mcrypt.c:642
+#: src/mcrypt.c:641
 #, c-format
 msgid "Stdin was encrypted.\n"
 msgstr "Stdin wurde verschlsselt.\n"
 
-#: src/mcrypt.c:660
+#: src/mcrypt.c:659
 #, c-format
 msgid "File %s was NOT encrypted successfully.\n"
 msgstr "Datei %s wurde NICHT erfolgreich verschlsselt.\n"
 
-#: src/mcrypt.c:670
+#: src/mcrypt.c:669
 msgid "Stdin was NOT encrypted successfully.\n"
 msgstr "Stdin wurde NICHT erfolgreich verschlsselt.\n"
 
-#: src/mcrypt.c:732
+#: src/mcrypt.c:731
 msgid "Unknown suffix. Will append '.dc'.\n"
 msgstr ""
 
-#: src/keys.c:133
+#: src/keys.c:131
 msgid "Key transformation failed.\n"
 msgstr "Schlsseltransformierung fehlgeschlagen.\n"
 
-#: src/xmalloc.c:37 src/xmalloc.c:55 src/xmalloc.c:72 src/xmalloc.c:91
-#: src/xmalloc.c:107 src/xmalloc.c:124 src/xmalloc.c:146
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
 #, c-format
 msgid "Cannot allocate memory\n"
 msgstr "Konnte keinen Speicher allozieren\n"
@@ -686,7 +691,7 @@ msgstr "Konnte nicht dup2 Kinder stdout!
 #: src/popen.c:106 src/popen.c:123
 #, c-format
 msgid "could not close read-access of child stdin!\n"
-msgstr "Konnte Lesezugriff fr Kinder stdin nicht schliessen!\n"
+msgstr "Konnte Lesezugriff fr Kinder stdin nicht schlieen!\n"
 
 #: src/popen.c:111
 #, c-format
@@ -701,7 +706,7 @@ msgstr "Konnte nicht dup2 Kinder stdout!
 #: src/popen.c:115 src/popen.c:129
 #, c-format
 msgid "could not close write-access of child stdout!\n"
-msgstr "Konnte Schreibzugriff fr Kinder stdout nicht schliessen!\n"
+msgstr "Konnte Schreibzugriff fr Kinder stdout nicht schlieen!\n"
 
 #: src/popen.c:125
 #, c-format
@@ -713,20 +718,20 @@ msgstr "Konnte nicht fdopen Kinder stdin
 msgid "could not fdopen child stdout pipe!\n"
 msgstr "Konnte nicht fdopen Kinder stdout Pipe!\n"
 
-#: src/random.c:94
+#: src/random.c:92
 msgid "mhash_init() failed."
 msgstr ""
 
-#: src/random.c:124
+#: src/random.c:122
 msgid "Error while reading random data\n"
 msgstr ""
 
-#: src/random.c:148 src/classic.c:118 src/classic.c:533
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
 #, fuzzy
 msgid "Mcrypt failed to open module.\n"
 msgstr "Mcrypt konnte das Modul nicht ffnen.\n"
 
-#: src/random.c:151
+#: src/random.c:149
 msgid "Mcrypt failed to initialize cipher.\n"
 msgstr ""
 
--- mcrypt-2.6.8.orig/po/el.po
+++ mcrypt-2.6.8/po/el.po
@@ -5,45 +5,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mcrypt 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 22:09+0200\n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
 "PO-Revision-Date: 1999-01-15 19:34+0200\n"
 "Last-Translator: Nikos Mavroyanopoulos <nmav@hellug.gr>\n"
 "Language-Team: Hellenic <nls@hellug.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/extra.c:99
+#: src/extra.c:96
 #, c-format
 msgid "Keywords do not match or they are too long.\n"
 msgstr "        \n"
 
-#: src/extra.c:114
+#: src/extra.c:111
 #, c-format
 msgid "Enter passphrase: "
 msgstr "  -: "
 
-#: src/extra.c:119
+#: src/extra.c:116
 #, c-format
 msgid "Enter the passphrase (maximum of %d characters)\n"
 msgstr "    ( %d )\n"
 
-#: src/extra.c:123
+#: src/extra.c:120
 #, c-format
 msgid "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
 "   ,    \n"
 
-#: src/extra.c:190 src/extra.c:195 src/extra.c:200 src/extra.c:205
-#: src/extra.c:210 src/extra.c:215
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
 msgid "Unsupported version of encrypted file\n"
 msgstr "       \n"
 
-#: src/extra.c:221
+#: src/extra.c:218
 msgid "No Initialization vector was used.\n"
 msgstr "  Initialization vector.\n"
 
-#: src/extra.c:261
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
 msgid ""
 "This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -51,7 +56,7 @@ msgstr ""
 "        2.2  mcrypt.  "
 "        .\n"
 
-#: src/extra.c:266
+#: src/extra.c:268
 msgid ""
 "This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -59,20 +64,20 @@ msgstr ""
 "        2.1  mcrypt.  "
 "        .\n"
 
-#: src/extra.c:270
+#: src/extra.c:272
 msgid ""
 "Unable to get algorithm information. Use the --bare flag and specify the "
-"algorithm manualy.\n"
+"algorithm manually.\n"
 msgstr ""
 "    .   --bare "
 "     .\n"
 
-#: src/extra.c:452
+#: src/extra.c:454
 #, c-format
 msgid "Signal %d caught. Exiting.\n"
 msgstr "  %d . .\n"
 
-#: src/extra.c:464
+#: src/extra.c:466
 #, c-format
 msgid ""
 "\n"
@@ -81,29 +86,29 @@ msgstr ""
 "\n"
 "  %d . .\n"
 
-#: src/extra.c:490
+#: src/extra.c:492
 #, c-format
 msgid "Keyfile could not be opened. Ignoring it.\n"
 msgstr "       . .\n"
 
-#: src/extra.c:553
+#: src/extra.c:555
 #, c-format
 msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
 msgstr "%s:  %s  .    (y  n);"
 
-#: src/extra.c:615
+#: src/extra.c:617
 msgid "Could not push character back to stream\n"
 msgstr "        stream\n"
 
-#: src/extra.c:623
+#: src/extra.c:625
 msgid "Could not open file\n"
 msgstr "      \n"
 
-#: src/extra.c:636
+#: src/extra.c:638
 msgid "An OpenPGP encrypted file has been detected.\n"
 msgstr " OpenPGP   .\n"
 
-#: src/extra.c:651
+#: src/extra.c:653
 #, c-format
 msgid ""
 "Algorithm: %s\n"
@@ -116,52 +121,52 @@ msgstr ""
 ": %s\n"
 " : %s\n"
 
-#: src/extra.c:659
+#: src/extra.c:661
 #, c-format
 msgid "File format: %s\n"
 msgstr " : %s\n"
 
-#: src/extra.c:664
+#: src/extra.c:666
 #, c-format
 msgid "Input File: %s\n"
 msgstr " : %s\n"
 
-#: src/extra.c:667
+#: src/extra.c:669
 #, c-format
 msgid "Output File: %s\n"
 msgstr " : %s\n"
 
-#: src/extra.c:712
+#: src/extra.c:714
 #, c-format
 msgid "Time needed: "
 msgstr "  : "
 
-#: src/extra.c:715
+#: src/extra.c:717
 #, c-format
 msgid "%lu hours"
 msgstr "%lu "
 
-#: src/extra.c:722
+#: src/extra.c:724
 #, c-format
 msgid "%lu minutes"
 msgstr "%lu "
 
-#: src/extra.c:729
+#: src/extra.c:731
 #, c-format
 msgid "%lu seconds"
 msgstr "%lu "
 
-#: src/extra.c:736
+#: src/extra.c:738
 #, c-format
 msgid "%lu milliseconds"
 msgstr "%lu "
 
-#: src/extra.c:741
+#: src/extra.c:743
 #, c-format
 msgid "Wow, no time counted!\n"
 msgstr ",   !\n"
 
-#: src/extra.c:748
+#: src/extra.c:750
 #, c-format
 msgid ""
 "Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
@@ -170,7 +175,7 @@ msgstr ""
 " %.3f MB,   %.3f MB/sec (1 MB == 1000000 Bytes).\n"
 "\n"
 
-#: src/extra.c:755
+#: src/extra.c:757
 #, c-format
 msgid ""
 "Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
@@ -179,7 +184,7 @@ msgstr ""
 " %.3f KB,   %.3f KB/sec (1 KB == 1000 Bytes).\n"
 "\n"
 
-#: src/mcrypt.c:80
+#: src/mcrypt.c:79
 #, c-format
 msgid ""
 "\n"
@@ -190,7 +195,7 @@ msgstr ""
 "   mcrypt-dev@lists.hellug.gr.\n"
 "\n"
 
-#: src/mcrypt.c:90
+#: src/mcrypt.c:89
 #, c-format
 msgid ""
 "\n"
@@ -229,83 +234,83 @@ msgstr ""
 "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
 "\n"
 
-#: src/mcrypt.c:133
+#: src/mcrypt.c:132
 #, c-format
 msgid "Mcrypt v.%s (%s-%s-%s)\n"
 msgstr "Mcrypt v.%s (%s-%s-%s)\n"
 
-#: src/mcrypt.c:135
+#: src/mcrypt.c:134
 #, c-format
 msgid "Linked against libmcrypt v.%s\n"
 msgstr "   libmcrypt v.%s\n"
 
-#: src/mcrypt.c:139
+#: src/mcrypt.c:138
 #, c-format
 msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
 msgstr ""
 "  (C) 1998-2002   (nmav@gnutls."
 "org)\n"
 
-#: src/mcrypt.c:152
+#: src/mcrypt.c:151
 msgid "The specified key size is too large for this algorithm.\n"
 msgstr ""
 "        ,   "
 " .\n"
 
-#: src/mcrypt.c:177
+#: src/mcrypt.c:176
 msgid "The specified key size not valid for this algorithm.\n"
 msgstr ""
 "           "
 " .\n"
 
-#: src/mcrypt.c:214 src/mcrypt.c:266
+#: src/mcrypt.c:213 src/mcrypt.c:265
 msgid "Error in the arguments. Use the --help parameter for more info.\n"
 msgstr ""
 "  .    --help  "
 " .\n"
 
-#: src/mcrypt.c:219
+#: src/mcrypt.c:218
 msgid "Warning: Cannot access config file.\n"
 msgstr ":     .\n"
 
-#: src/mcrypt.c:235
+#: src/mcrypt.c:234
 msgid ""
 "Error in the configuration file. Use the --help parameter for more info.\n"
 msgstr ""
 "   .    --help  "
 " .\n"
 
-#: src/mcrypt.c:336
+#: src/mcrypt.c:335
 #, c-format
 msgid "The '%s' hash algorithm was not found.\n"
 msgstr " '%s' hash   .\n"
 
-#: src/mcrypt.c:339
+#: src/mcrypt.c:338
 #, c-format
 msgid "Use the --hashlist parameter to view all supported hashes.\n"
 msgstr ""
 "  --hashlist      \n"
 " hash .\n"
 
-#: src/mcrypt.c:379
+#: src/mcrypt.c:378
 msgid "Illegal compression level\n"
 msgstr "   \n"
 
-#: src/mcrypt.c:392
+#: src/mcrypt.c:391
 #, c-format
 msgid "Error in algorithm '%s'.\n"
 msgstr "   '%s'.\n"
 
-#: src/mcrypt.c:401 src/mcrypt.c:413
+#: src/mcrypt.c:400 src/mcrypt.c:412
 #, c-format
 msgid "Error in mode '%s'.\n"
 msgstr "    '%s'.\n"
 
-#: src/mcrypt.c:427
+#: src/mcrypt.c:426
 msgid "Warning: It is insecure to specify keywords in the command line\n"
 msgstr ":         \n"
 
-#: src/mcrypt.c:436
+#: src/mcrypt.c:435
 msgid ""
 "Warning: This system does not have a random device. Will use the included "
 "entropy gatherer.\n"
@@ -313,17 +318,17 @@ msgstr ""
 ":        .  "
 "    .\n"
 
-#: src/mcrypt.c:487
+#: src/mcrypt.c:486
 #, c-format
 msgid "%s: %s is not a regular file. Skipping...\n"
 msgstr "%s:   %s   ... ...\n"
 
-#: src/mcrypt.c:506
+#: src/mcrypt.c:505
 #, c-format
 msgid "%s: Encrypted data will not be read from a terminal.\n"
 msgstr "%s:       .\n"
 
-#: src/mcrypt.c:510
+#: src/mcrypt.c:509
 msgid ""
 "Redirect the input instead.\n"
 "Use the --help parameter for more help.\n"
@@ -331,12 +336,12 @@ msgstr ""
 "    .\n"
 "   --help   .\n"
 
-#: src/mcrypt.c:525
+#: src/mcrypt.c:524
 #, c-format
 msgid "%s: Encrypted data will not be written to a terminal.\n"
 msgstr "%s:       .\n"
 
-#: src/mcrypt.c:529
+#: src/mcrypt.c:528
 msgid ""
 "Redirect the output instead.\n"
 "Use the --help parameter for more help.\n"
@@ -344,59 +349,59 @@ msgstr ""
 "    .\n"
 "   --help   .\n"
 
-#: src/mcrypt.c:549
+#: src/mcrypt.c:548
 #, c-format
 msgid "%s: file %s has the .nc suffix... skipping...\n"
 msgstr "%s:   %s     .nc... ...\n"
 
-#: src/mcrypt.c:593
+#: src/mcrypt.c:592
 #, c-format
 msgid "File %s was decrypted.\n"
 msgstr "  %s .\n"
 
-#: src/mcrypt.c:596
+#: src/mcrypt.c:595
 #, c-format
 msgid "Stdin was decrypted.\n"
 msgstr "   .\n"
 
-#: src/mcrypt.c:615
+#: src/mcrypt.c:614
 #, c-format
 msgid "File %s was NOT decrypted successfully.\n"
 msgstr "  %s   .\n"
 
-#: src/mcrypt.c:625
+#: src/mcrypt.c:624
 msgid "Stdin was NOT decrypted successfully.\n"
 msgstr "     .\n"
 
-#: src/mcrypt.c:639
+#: src/mcrypt.c:638
 #, c-format
 msgid "File %s was encrypted.\n"
 msgstr "  %s .\n"
 
-#: src/mcrypt.c:642
+#: src/mcrypt.c:641
 #, c-format
 msgid "Stdin was encrypted.\n"
 msgstr "   .\n"
 
-#: src/mcrypt.c:660
+#: src/mcrypt.c:659
 #, c-format
 msgid "File %s was NOT encrypted successfully.\n"
 msgstr "  %s   .\n"
 
-#: src/mcrypt.c:670
+#: src/mcrypt.c:669
 msgid "Stdin was NOT encrypted successfully.\n"
 msgstr "     .\n"
 
-#: src/mcrypt.c:732
+#: src/mcrypt.c:731
 msgid "Unknown suffix. Will append '.dc'.\n"
 msgstr "  .   '.dc'.\n"
 
-#: src/keys.c:133
+#: src/keys.c:131
 msgid "Key transformation failed.\n"
 msgstr "    .\n"
 
-#: src/xmalloc.c:37 src/xmalloc.c:55 src/xmalloc.c:72 src/xmalloc.c:91
-#: src/xmalloc.c:107 src/xmalloc.c:124 src/xmalloc.c:146
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
 #, c-format
 msgid "Cannot allocate memory\n"
 msgstr "  \n"
@@ -722,19 +727,19 @@ msgstr "    fdopen  
 msgid "could not fdopen child stdout pipe!\n"
 msgstr "    fdopen     stdout!\n"
 
-#: src/random.c:94
+#: src/random.c:92
 msgid "mhash_init() failed."
 msgstr " mhash_init() ."
 
-#: src/random.c:124
+#: src/random.c:122
 msgid "Error while reading random data\n"
 msgstr "     \n"
 
-#: src/random.c:148 src/classic.c:118 src/classic.c:533
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
 msgid "Mcrypt failed to open module.\n"
 msgstr "      \n"
 
-#: src/random.c:151
+#: src/random.c:149
 msgid "Mcrypt failed to initialize cipher.\n"
 msgstr "    .\n"
 
--- mcrypt-2.6.8.orig/po/es_AR.po
+++ mcrypt-2.6.8/po/es_AR.po
@@ -6,46 +6,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mcrypt v2.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 22:09+0200\n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
 "PO-Revision-Date: 2002-10-06 15:15-0300\n"
 "Last-Translator: Ariel Fermani <the_end@bbs.frc.utn.edu.ar>\n"
 "Language-Team: Argentinian <translation-es-AR@lists.sourceforge.net>\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/extra.c:99
+#: src/extra.c:96
 #, c-format
 msgid "Keywords do not match or they are too long.\n"
 msgstr "Las palabras clave no coinciden o son demasiado largas.\n"
 
-#: src/extra.c:114
+#: src/extra.c:111
 #, c-format
 msgid "Enter passphrase: "
 msgstr "Ingrese contrasea: "
 
-#: src/extra.c:119
+#: src/extra.c:116
 #, c-format
 msgid "Enter the passphrase (maximum of %d characters)\n"
 msgstr "Ingrese la contrasea (mximo de %d caracteres).\n"
 
-#: src/extra.c:123
+#: src/extra.c:120
 #, c-format
 msgid "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
 "Por favor, utilice una combinacin de letras maysculas, minsculas y "
 "nmeros.\n"
 
-#: src/extra.c:190 src/extra.c:195 src/extra.c:200 src/extra.c:205
-#: src/extra.c:210 src/extra.c:215
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
 msgid "Unsupported version of encrypted file\n"
 msgstr "Versin de archivo cifrado no soportada\n"
 
-#: src/extra.c:221
+#: src/extra.c:218
 msgid "No Initialization vector was used.\n"
 msgstr "No fue utilizado el Vector de Inicializacin.\n"
 
-#: src/extra.c:261
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
 msgid ""
 "This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -53,7 +58,7 @@ msgstr ""
 "Este es un archivo cifrado con la versin 2.2 de mcrypt. Desafortunadamente "
 "necesita esa versin para descifrarlo.\n"
 
-#: src/extra.c:266
+#: src/extra.c:268
 msgid ""
 "This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
@@ -61,20 +66,20 @@ msgstr ""
 "Este es un archivo cifrado con la versin 2.1 de mcrypt. Desafortunadamente "
 "necesita esa versin para descifrarlo.\n"
 
-#: src/extra.c:270
+#: src/extra.c:272
 msgid ""
 "Unable to get algorithm information. Use the --bare flag and specify the "
-"algorithm manualy.\n"
+"algorithm manually.\n"
 msgstr ""
 "No se puede obtener informacin sobre el algoritmo. Utilice el indicador --"
 "bare y especifique el algoritmo manualmente.\n"
 
-#: src/extra.c:452
+#: src/extra.c:454
 #, c-format
 msgid "Signal %d caught. Exiting.\n"
 msgstr "Seal %d capturada. Saliendo.\n"
 
-#: src/extra.c:464
+#: src/extra.c:466
 #, c-format
 msgid ""
 "\n"
@@ -83,29 +88,29 @@ msgstr ""
 "\n"
 "Seal %d capturada. Saliendo.\n"
 
-#: src/extra.c:490
+#: src/extra.c:492
 #, c-format
 msgid "Keyfile could not be opened. Ignoring it.\n"
 msgstr "El archivo de claves no pudo ser abierto. Ignorndolo.\n"
 
-#: src/extra.c:553
+#: src/extra.c:555
 #, c-format
 msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
 msgstr "%s: `%s' todava existe. Desea sobreescribirlo? (y  n) "
 
-#: src/extra.c:615
+#: src/extra.c:617
 msgid "Could not push character back to stream\n"
 msgstr "No se puede empujar al caracter de vuelta al flujo\n"
 
-#: src/extra.c:623
+#: src/extra.c:625
 msgid "Could not open file\n"
 msgstr "No se puede abrir el archivo\n"
 
-#: src/extra.c:636
+#: src/extra.c:638
 msgid "An OpenPGP encrypted file has been detected.\n"
 msgstr "Ha sido detectado un archivo cifrado OpenPGP.\n"
 
-#: src/extra.c:651
+#: src/extra.c:653
 #, c-format
 msgid ""
 "Algorithm: %s\n"
@@ -118,52 +123,52 @@ msgstr ""
 "Modo: %s\n"
 "Modo de la palabra clave: %s\n"
 
-#: src/extra.c:659
+#: src/extra.c:661
 #, c-format
 msgid "File format: %s\n"
 msgstr "Formato del archivo: %s\n"
 
-#: src/extra.c:664
+#: src/extra.c:666
 #, c-format
 msgid "Input File: %s\n"
 msgstr "Archivo de entrada: %s\n"
 
-#: src/extra.c:667
+#: src/extra.c:669
 #, c-format
 msgid "Output File: %s\n"
 msgstr "Archivo de salida: %s\n"
 
-#: src/extra.c:712
+#: src/extra.c:714
 #, c-format
 msgid "Time needed: "
 msgstr "Tiempo necesitado: "
 
-#: src/extra.c:715
+#: src/extra.c:717
 #, c-format
 msgid "%lu hours"
 msgstr "%lu horas"
 
-#: src/extra.c:722
+#: src/extra.c:724
 #, c-format
 msgid "%lu minutes"
 msgstr "%lu minutos"
 
-#: src/extra.c:729
+#: src/extra.c:731
 #, c-format
 msgid "%lu seconds"
 msgstr "%lu segundos"
 
-#: src/extra.c:736
+#: src/extra.c:738
 #, c-format
 msgid "%lu milliseconds"
 msgstr "%lu milisegundos"
 
-#: src/extra.c:741
+#: src/extra.c:743
 #, c-format
 msgid "Wow, no time counted!\n"
 msgstr "Wow, no se ha contado el tiempo!\n"
 
-#: src/extra.c:748
+#: src/extra.c:750
 #, c-format
 msgid ""
 "Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
@@ -172,7 +177,7 @@ msgstr ""
 "%.3f MB procesados, a una velocidad de %.3f MB/seg (1 MB == 1000000 Bytes).\n"
 "\n"
 
-#: src/extra.c:755
+#: src/extra.c:757
 #, c-format
 msgid ""
 "Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
@@ -181,7 +186,7 @@ msgstr ""
 "%.3f KB procesados, a una velocidad de %.3f KB/seg (1 KB == 1000 Bytes).\n"
 "\n"
 
-#: src/mcrypt.c:80
+#: src/mcrypt.c:79
 #, c-format
 msgid ""
 "\n"
@@ -192,7 +197,7 @@ msgstr ""
 "Por favor, reporte `bugs' a <mcrypt-dev@lists.hellug.gr>.\n"
 "\n"
 
-#: src/mcrypt.c:90
+#: src/mcrypt.c:89
 #, c-format
 msgid ""
 "\n"
@@ -229,78 +234,78 @@ msgstr ""
 "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
 "\n"
 
-#: src/mcrypt.c:133
+#: src/mcrypt.c:132
 #, c-format
 msgid "Mcrypt v.%s (%s-%s-%s)\n"
 msgstr "Mcrypt v%s (%s-%s-%s)\n"
 
-#: src/mcrypt.c:135
+#: src/mcrypt.c:134
 #, c-format
 msgid "Linked against libmcrypt v.%s\n"
 msgstr "Enlazado contra libmcrypt v%s\n"
 
-#: src/mcrypt.c:139
+#: src/mcrypt.c:138
 #, c-format
 msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
 msgstr "Copyright (C) 1998-2002 Nikos Mavroyanopoulos <nmav@gnutls.org>\n"
 
-#: src/mcrypt.c:152
+#: src/mcrypt.c:151
 msgid "The specified key size is too large for this algorithm.\n"
 msgstr ""
 "El tamao de la clave especificado es demasiado largo para este algoritmo.\n"
 
-#: src/mcrypt.c:177
+#: src/mcrypt.c:176
 msgid "The specified key size not valid for this algorithm.\n"
 msgstr "El tamao de la clave especificado no es vlido para este algoritmo.\n"
 
-#: src/mcrypt.c:214 src/mcrypt.c:266
+#: src/mcrypt.c:213 src/mcrypt.c:265
 msgid "Error in the arguments. Use the --help parameter for more info.\n"
 msgstr ""
 "Error en los argumentos. Utilice el parmetro --help para ms informacin.\n"
 
-#: src/mcrypt.c:219
+#: src/mcrypt.c:218
 msgid "Warning: Cannot access config file.\n"
 msgstr "Advertencia: No se puede acceder al archivo de configuracin.\n"
 
-#: src/mcrypt.c:235
+#: src/mcrypt.c:234
 msgid ""
 "Error in the configuration file. Use the --help parameter for more info.\n"
 msgstr ""
 "Error en el archivo de configuracin. Utilice el parmetro --help para ms "
 "informacin.\n"
 
-#: src/mcrypt.c:336
+#: src/mcrypt.c:335
 #, c-format
 msgid "The '%s' hash algorithm was not found.\n"
 msgstr "El algoritmo hash `%s' no fue encontrado.\n"
 
-#: src/mcrypt.c:339
+#: src/mcrypt.c:338
 #, c-format
 msgid "Use the --hashlist parameter to view all supported hashes.\n"
 msgstr ""
 "Utilice el parmetro --hashlist para ver todos los `hashes' soportados.\n"
 
-#: src/mcrypt.c:379
+#: src/mcrypt.c:378
 msgid "Illegal compression level\n"
 msgstr "Nivel de compresin ilegal\n"
 
-#: src/mcrypt.c:392
+#: src/mcrypt.c:391
 #, c-format
 msgid "Error in algorithm '%s'.\n"
 msgstr "Error en algoritmo `%s'.\n"
 
-#: src/mcrypt.c:401 src/mcrypt.c:413
+#: src/mcrypt.c:400 src/mcrypt.c:412
 #, c-format
 msgid "Error in mode '%s'.\n"
 msgstr "Error en modo `%s'.\n"
 
-#: src/mcrypt.c:427
+#: src/mcrypt.c:426
 msgid "Warning: It is insecure to specify keywords in the command line\n"
 msgstr ""
 "Advertencia: Es inseguro especificar palabras clave en la lnea de "
 "comandos.\n"
 
-#: src/mcrypt.c:436
+#: src/mcrypt.c:435
 msgid ""
 "Warning: This system does not have a random device. Will use the included "
 "entropy gatherer.\n"
@@ -308,17 +313,17 @@ msgstr ""
 "Advertencia: Este sistema no tiene un dispositivo aleatorio. Se utilizar el "
 "recolector de entropa incluido.\n"
 
-#: src/mcrypt.c:487
+#: src/mcrypt.c:486
 #, c-format
 msgid "%s: %s is not a regular file. Skipping...\n"
 msgstr "%s: `%s' no es un archivo regular. Ignorndolo...\n"
 
-#: src/mcrypt.c:506
+#: src/mcrypt.c:505
 #, c-format
 msgid "%s: Encrypted data will not be read from a terminal.\n"
 msgstr "%s: Los datos cifrados no sern ledos desde una terminal.\n"
 
-#: src/mcrypt.c:510
+#: src/mcrypt.c:509
 msgid ""
 "Redirect the input instead.\n"
 "Use the --help parameter for more help.\n"
@@ -326,12 +331,12 @@ msgstr ""
 "Redireccione la entrada en su lugar.\n"
 "Utilice el parmetro --help para obtener ms ayuda.\n"
 
-#: src/mcrypt.c:525
+#: src/mcrypt.c:524
 #, c-format
 msgid "%s: Encrypted data will not be written to a terminal.\n"
 msgstr "%s: Los datos cifrados no sern escritos a una terminal.\n"
 
-#: src/mcrypt.c:529
+#: src/mcrypt.c:528
 msgid ""
 "Redirect the output instead.\n"
 "Use the --help parameter for more help.\n"
@@ -339,59 +344,59 @@ msgstr ""
 "Redireccione la salida en su lugar.\n"
 "Utilice el parmetro --help para obtener ms ayuda.\n"
 
-#: src/mcrypt.c:549
+#: src/mcrypt.c:548
 #, c-format
 msgid "%s: file %s has the .nc suffix... skipping...\n"
 msgstr "%s: el archivo `%s' tiene el sufijo .nc... ignorndolo...\n"
 
-#: src/mcrypt.c:593
+#: src/mcrypt.c:592
 #, c-format
 msgid "File %s was decrypted.\n"
 msgstr "El archivo `%s' fue descifrado.\n"
 
-#: src/mcrypt.c:596
+#: src/mcrypt.c:595
 #, c-format
 msgid "Stdin was decrypted.\n"
 msgstr "Stdin fue descifrada.\n"
 
-#: src/mcrypt.c:615
+#: src/mcrypt.c:614
 #, c-format
 msgid "File %s was NOT decrypted successfully.\n"
 msgstr "El archivo `%s' NO fue descifrado exitosamente.\n"
 
-#: src/mcrypt.c:625
+#: src/mcrypt.c:624
 msgid "Stdin was NOT decrypted successfully.\n"
 msgstr "Stdin NO fue descifrada exitosamente.\n"
 
-#: src/mcrypt.c:639
+#: src/mcrypt.c:638
 #, c-format
 msgid "File %s was encrypted.\n"
 msgstr "El archivo `%s' fue cifrado.\n"
 
-#: src/mcrypt.c:642
+#: src/mcrypt.c:641
 #, c-format
 msgid "Stdin was encrypted.\n"
 msgstr "Stdin fue cifrada.\n"
 
-#: src/mcrypt.c:660
+#: src/mcrypt.c:659
 #, c-format
 msgid "File %s was NOT encrypted successfully.\n"
 msgstr "El archivo `%s' NO fue cifrado exitosamente.\n"
 
-#: src/mcrypt.c:670
+#: src/mcrypt.c:669
 msgid "Stdin was NOT encrypted successfully.\n"
 msgstr "Stdin NO fue cifrada exitosamente.\n"
 
-#: src/mcrypt.c:732
+#: src/mcrypt.c:731
 msgid "Unknown suffix. Will append '.dc'.\n"
 msgstr "Sufijo desconocido. Se agregar `.dc'.\n"
 
-#: src/keys.c:133
+#: src/keys.c:131
 msgid "Key transformation failed.\n"
 msgstr "Transformacin de la clave fallida.\n"
 
-#: src/xmalloc.c:37 src/xmalloc.c:55 src/xmalloc.c:72 src/xmalloc.c:91
-#: src/xmalloc.c:107 src/xmalloc.c:124 src/xmalloc.c:146
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
 #, c-format
 msgid "Cannot allocate memory\n"
 msgstr "No se puede asignar memoria\n"
@@ -709,19 +714,19 @@ msgstr "no se puede hacer un fdopen a l
 msgid "could not fdopen child stdout pipe!\n"
 msgstr "no se puede hacer un fdopen a la tubera de la stdout hija!\n"
 
-#: src/random.c:94
+#: src/random.c:92
 msgid "mhash_init() failed."
 msgstr "mhash_init() fallido."
 
-#: src/random.c:124
+#: src/random.c:122
 msgid "Error while reading random data\n"
 msgstr "Error mientras se leen datos aleatorios\n"
 
-#: src/random.c:148 src/classic.c:118 src/classic.c:533
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
 msgid "Mcrypt failed to open module.\n"
 msgstr "Mcrypt fall al abrir mdulo.\n"
 
-#: src/random.c:151
+#: src/random.c:149
 msgid "Mcrypt failed to initialize cipher.\n"
 msgstr "Mcrypt fall al inicializar cifrador.\n"
 
--- mcrypt-2.6.8.orig/po/mcrypt.pot
+++ mcrypt-2.6.8/po/mcrypt.pot
@@ -1,103 +1,108 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Nikos Mavroyanopoulos
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the mcrypt package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: mcrypt 2.6.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 22:09+0200\n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/extra.c:99
+#: src/extra.c:96
 #, c-format
 msgid "Keywords do not match or they are too long.\n"
 msgstr ""
 
-#: src/extra.c:114
+#: src/extra.c:111
 #, c-format
 msgid "Enter passphrase: "
 msgstr ""
 
-#: src/extra.c:119
+#: src/extra.c:116
 #, c-format
 msgid "Enter the passphrase (maximum of %d characters)\n"
 msgstr ""
 
-#: src/extra.c:123
+#: src/extra.c:120
 #, c-format
 msgid "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
 
-#: src/extra.c:190 src/extra.c:195 src/extra.c:200 src/extra.c:205
-#: src/extra.c:210 src/extra.c:215
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
 msgid "Unsupported version of encrypted file\n"
 msgstr ""
 
-#: src/extra.c:221
+#: src/extra.c:218
 msgid "No Initialization vector was used.\n"
 msgstr ""
 
-#: src/extra.c:261
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
 msgid ""
 "This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
 msgstr ""
 
-#: src/extra.c:266
+#: src/extra.c:268
 msgid ""
 "This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
 msgstr ""
 
-#: src/extra.c:270
+#: src/extra.c:272
 msgid ""
 "Unable to get algorithm information. Use the --bare flag and specify the "
-"algorithm manualy.\n"
+"algorithm manually.\n"
 msgstr ""
 
-#: src/extra.c:452
+#: src/extra.c:454
 #, c-format
 msgid "Signal %d caught. Exiting.\n"
 msgstr ""
 
-#: src/extra.c:464
+#: src/extra.c:466
 #, c-format
 msgid ""
 "\n"
 "Signal %d caught. Exiting.\n"
 msgstr ""
 
-#: src/extra.c:490
+#: src/extra.c:492
 #, c-format
 msgid "Keyfile could not be opened. Ignoring it.\n"
 msgstr ""
 
-#: src/extra.c:553
+#: src/extra.c:555
 #, c-format
 msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
 msgstr ""
 
-#: src/extra.c:615
+#: src/extra.c:617
 msgid "Could not push character back to stream\n"
 msgstr ""
 
-#: src/extra.c:623
+#: src/extra.c:625
 msgid "Could not open file\n"
 msgstr ""
 
-#: src/extra.c:636
+#: src/extra.c:638
 msgid "An OpenPGP encrypted file has been detected.\n"
 msgstr ""
 
-#: src/extra.c:651
+#: src/extra.c:653
 #, c-format
 msgid ""
 "Algorithm: %s\n"
@@ -106,66 +111,66 @@ msgid ""
 "Keyword mode: %s\n"
 msgstr ""
 
-#: src/extra.c:659
+#: src/extra.c:661
 #, c-format
 msgid "File format: %s\n"
 msgstr ""
 
-#: src/extra.c:664
+#: src/extra.c:666
 #, c-format
 msgid "Input File: %s\n"
 msgstr ""
 
-#: src/extra.c:667
+#: src/extra.c:669
 #, c-format
 msgid "Output File: %s\n"
 msgstr ""
 
-#: src/extra.c:712
+#: src/extra.c:714
 #, c-format
 msgid "Time needed: "
 msgstr ""
 
-#: src/extra.c:715
+#: src/extra.c:717
 #, c-format
 msgid "%lu hours"
 msgstr ""
 
-#: src/extra.c:722
+#: src/extra.c:724
 #, c-format
 msgid "%lu minutes"
 msgstr ""
 
-#: src/extra.c:729
+#: src/extra.c:731
 #, c-format
 msgid "%lu seconds"
 msgstr ""
 
-#: src/extra.c:736
+#: src/extra.c:738
 #, c-format
 msgid "%lu milliseconds"
 msgstr ""
 
-#: src/extra.c:741
+#: src/extra.c:743
 #, c-format
 msgid "Wow, no time counted!\n"
 msgstr ""
 
-#: src/extra.c:748
+#: src/extra.c:750
 #, c-format
 msgid ""
 "Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
 "\n"
 msgstr ""
 
-#: src/extra.c:755
+#: src/extra.c:757
 #, c-format
 msgid ""
 "Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:80
+#: src/mcrypt.c:79
 #, c-format
 msgid ""
 "\n"
@@ -173,7 +178,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:90
+#: src/mcrypt.c:89
 #, c-format
 msgid ""
 "\n"
@@ -194,156 +199,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:133
+#: src/mcrypt.c:132
 #, c-format
 msgid "Mcrypt v.%s (%s-%s-%s)\n"
 msgstr ""
 
-#: src/mcrypt.c:135
+#: src/mcrypt.c:134
 #, c-format
 msgid "Linked against libmcrypt v.%s\n"
 msgstr ""
 
-#: src/mcrypt.c:139
+#: src/mcrypt.c:138
 #, c-format
 msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
 msgstr ""
 
-#: src/mcrypt.c:152
+#: src/mcrypt.c:151
 msgid "The specified key size is too large for this algorithm.\n"
 msgstr ""
 
-#: src/mcrypt.c:177
+#: src/mcrypt.c:176
 msgid "The specified key size not valid for this algorithm.\n"
 msgstr ""
 
-#: src/mcrypt.c:214 src/mcrypt.c:266
+#: src/mcrypt.c:213 src/mcrypt.c:265
 msgid "Error in the arguments. Use the --help parameter for more info.\n"
 msgstr ""
 
-#: src/mcrypt.c:219
+#: src/mcrypt.c:218
 msgid "Warning: Cannot access config file.\n"
 msgstr ""
 
-#: src/mcrypt.c:235
+#: src/mcrypt.c:234
 msgid ""
 "Error in the configuration file. Use the --help parameter for more info.\n"
 msgstr ""
 
-#: src/mcrypt.c:336
+#: src/mcrypt.c:335
 #, c-format
 msgid "The '%s' hash algorithm was not found.\n"
 msgstr ""
 
-#: src/mcrypt.c:339
+#: src/mcrypt.c:338
 #, c-format
 msgid "Use the --hashlist parameter to view all supported hashes.\n"
 msgstr ""
 
-#: src/mcrypt.c:379
+#: src/mcrypt.c:378
 msgid "Illegal compression level\n"
 msgstr ""
 
-#: src/mcrypt.c:392
+#: src/mcrypt.c:391
 #, c-format
 msgid "Error in algorithm '%s'.\n"
 msgstr ""
 
-#: src/mcrypt.c:401 src/mcrypt.c:413
+#: src/mcrypt.c:400 src/mcrypt.c:412
 #, c-format
 msgid "Error in mode '%s'.\n"
 msgstr ""
 
-#: src/mcrypt.c:427
+#: src/mcrypt.c:426
 msgid "Warning: It is insecure to specify keywords in the command line\n"
 msgstr ""
 
-#: src/mcrypt.c:436
+#: src/mcrypt.c:435
 msgid ""
 "Warning: This system does not have a random device. Will use the included "
 "entropy gatherer.\n"
 msgstr ""
 
-#: src/mcrypt.c:487
+#: src/mcrypt.c:486
 #, c-format
 msgid "%s: %s is not a regular file. Skipping...\n"
 msgstr ""
 
-#: src/mcrypt.c:506
+#: src/mcrypt.c:505
 #, c-format
 msgid "%s: Encrypted data will not be read from a terminal.\n"
 msgstr ""
 
-#: src/mcrypt.c:510
+#: src/mcrypt.c:509
 msgid ""
 "Redirect the input instead.\n"
 "Use the --help parameter for more help.\n"
 msgstr ""
 
-#: src/mcrypt.c:525
+#: src/mcrypt.c:524
 #, c-format
 msgid "%s: Encrypted data will not be written to a terminal.\n"
 msgstr ""
 
-#: src/mcrypt.c:529
+#: src/mcrypt.c:528
 msgid ""
 "Redirect the output instead.\n"
 "Use the --help parameter for more help.\n"
 msgstr ""
 
-#: src/mcrypt.c:549
+#: src/mcrypt.c:548
 #, c-format
 msgid "%s: file %s has the .nc suffix... skipping...\n"
 msgstr ""
 
-#: src/mcrypt.c:593
+#: src/mcrypt.c:592
 #, c-format
 msgid "File %s was decrypted.\n"
 msgstr ""
 
-#: src/mcrypt.c:596
+#: src/mcrypt.c:595
 #, c-format
 msgid "Stdin was decrypted.\n"
 msgstr ""
 
-#: src/mcrypt.c:615
+#: src/mcrypt.c:614
 #, c-format
 msgid "File %s was NOT decrypted successfully.\n"
 msgstr ""
 
-#: src/mcrypt.c:625
+#: src/mcrypt.c:624
 msgid "Stdin was NOT decrypted successfully.\n"
 msgstr ""
 
-#: src/mcrypt.c:639
+#: src/mcrypt.c:638
 #, c-format
 msgid "File %s was encrypted.\n"
 msgstr ""
 
-#: src/mcrypt.c:642
+#: src/mcrypt.c:641
 #, c-format
 msgid "Stdin was encrypted.\n"
 msgstr ""
 
-#: src/mcrypt.c:660
+#: src/mcrypt.c:659
 #, c-format
 msgid "File %s was NOT encrypted successfully.\n"
 msgstr ""
 
-#: src/mcrypt.c:670
+#: src/mcrypt.c:669
 msgid "Stdin was NOT encrypted successfully.\n"
 msgstr ""
 
-#: src/mcrypt.c:732
+#: src/mcrypt.c:731
 msgid "Unknown suffix. Will append '.dc'.\n"
 msgstr ""
 
-#: src/keys.c:133
+#: src/keys.c:131
 msgid "Key transformation failed.\n"
 msgstr ""
 
-#: src/xmalloc.c:37 src/xmalloc.c:55 src/xmalloc.c:72 src/xmalloc.c:91
-#: src/xmalloc.c:107 src/xmalloc.c:124 src/xmalloc.c:146
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
 #, c-format
 msgid "Cannot allocate memory\n"
 msgstr ""
@@ -646,19 +651,19 @@ msgstr ""
 msgid "could not fdopen child stdout pipe!\n"
 msgstr ""
 
-#: src/random.c:94
+#: src/random.c:92
 msgid "mhash_init() failed."
 msgstr ""
 
-#: src/random.c:124
+#: src/random.c:122
 msgid "Error while reading random data\n"
 msgstr ""
 
-#: src/random.c:148 src/classic.c:118 src/classic.c:533
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
 msgid "Mcrypt failed to open module.\n"
 msgstr ""
 
-#: src/random.c:151
+#: src/random.c:149
 msgid "Mcrypt failed to initialize cipher.\n"
 msgstr ""
 
--- mcrypt-2.6.8.orig/po/pl.po
+++ mcrypt-2.6.8/po/pl.po
@@ -6,69 +6,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mcrypt 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 22:09+0200\n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
 "PO-Revision-Date: 1999-06-28 21:12+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/extra.c:99
+#: src/extra.c:96
 #, c-format
 msgid "Keywords do not match or they are too long.\n"
 msgstr "Hasa nie pasuj do siebie lub s zbyt dugie.\n"
 
-#: src/extra.c:114
+#: src/extra.c:111
 #, c-format
 msgid "Enter passphrase: "
 msgstr "Wprowad haso: "
 
-#: src/extra.c:119
+#: src/extra.c:116
 #, c-format
 msgid "Enter the passphrase (maximum of %d characters)\n"
 msgstr "Wprowad haso (maksymalnie %d znakw)\n"
 
-#: src/extra.c:123
+#: src/extra.c:120
 #, c-format
 msgid "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr "Prosz uy kombinacji cyfr i maych i wielkich liter.\n"
 
-#: src/extra.c:190 src/extra.c:195 src/extra.c:200 src/extra.c:205
-#: src/extra.c:210 src/extra.c:215
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
 msgid "Unsupported version of encrypted file\n"
 msgstr ""
 
-#: src/extra.c:221
+#: src/extra.c:218
 msgid "No Initialization vector was used.\n"
 msgstr ""
 
-#: src/extra.c:261
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
 msgid ""
 "This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
 msgstr ""
 
-#: src/extra.c:266
+#: src/extra.c:268
 msgid ""
 "This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
 "you'll need that version to decrypt it.\n"
 msgstr ""
 
-#: src/extra.c:270
+#: src/extra.c:272
 msgid ""
 "Unable to get algorithm information. Use the --bare flag and specify the "
-"algorithm manualy.\n"
+"algorithm manually.\n"
 msgstr ""
 "Uzyskanie informacji o algorytmie niemoliwe. Uyj argumentu --bare i podaj\n"
 "algorytm rcznie.\n"
 
-#: src/extra.c:452
+#: src/extra.c:454
 #, c-format
 msgid "Signal %d caught. Exiting.\n"
 msgstr "Nadszed sygna %d. Zakoczenie programu.\n"
 
-#: src/extra.c:464
+#: src/extra.c:466
 #, c-format
 msgid ""
 "\n"
@@ -77,30 +82,30 @@ msgstr ""
 "\n"
 "Nadszed sygna %d. Zakoczenie programu.\n"
 
-#: src/extra.c:490
+#: src/extra.c:492
 #, c-format
 msgid "Keyfile could not be opened. Ignoring it.\n"
 msgstr "Nie mona otworzy pliku klucza. Zostaje on zignorowany.\n"
 
-#: src/extra.c:553
+#: src/extra.c:555
 #, c-format
 msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
 msgstr "%s: %s ju istnieje, czy chcesz nadpisa (y - tak, n - nie)?"
 
-#: src/extra.c:615
+#: src/extra.c:617
 msgid "Could not push character back to stream\n"
 msgstr ""
 
-#: src/extra.c:623
+#: src/extra.c:625
 #, fuzzy
 msgid "Could not open file\n"
 msgstr "Uszkodzony plik lub bdny klucz.\n"
 
-#: src/extra.c:636
+#: src/extra.c:638
 msgid "An OpenPGP encrypted file has been detected.\n"
 msgstr ""
 
-#: src/extra.c:651
+#: src/extra.c:653
 #, c-format
 msgid ""
 "Algorithm: %s\n"
@@ -109,66 +114,66 @@ msgid ""
 "Keyword mode: %s\n"
 msgstr ""
 
-#: src/extra.c:659
+#: src/extra.c:661
 #, fuzzy, c-format
 msgid "File format: %s\n"
 msgstr "Algorytm: %s\n"
 
-#: src/extra.c:664
+#: src/extra.c:666
 #, fuzzy, c-format
 msgid "Input File: %s\n"
 msgstr "Plik: %s\n"
 
-#: src/extra.c:667
+#: src/extra.c:669
 #, fuzzy, c-format
 msgid "Output File: %s\n"
 msgstr "Plik: %s\n"
 
-#: src/extra.c:712
+#: src/extra.c:714
 #, c-format
 msgid "Time needed: "
 msgstr ""
 
-#: src/extra.c:715
+#: src/extra.c:717
 #, c-format
 msgid "%lu hours"
 msgstr ""
 
-#: src/extra.c:722
+#: src/extra.c:724
 #, c-format
 msgid "%lu minutes"
 msgstr ""
 
-#: src/extra.c:729
+#: src/extra.c:731
 #, c-format
 msgid "%lu seconds"
 msgstr ""
 
-#: src/extra.c:736
+#: src/extra.c:738
 #, c-format
 msgid "%lu milliseconds"
 msgstr ""
 
-#: src/extra.c:741
+#: src/extra.c:743
 #, c-format
 msgid "Wow, no time counted!\n"
 msgstr ""
 
-#: src/extra.c:748
+#: src/extra.c:750
 #, c-format
 msgid ""
 "Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
 "\n"
 msgstr ""
 
-#: src/extra.c:755
+#: src/extra.c:757
 #, c-format
 msgid ""
 "Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:80
+#: src/mcrypt.c:79
 #, c-format
 msgid ""
 "\n"
@@ -176,7 +181,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/mcrypt.c:90
+#: src/mcrypt.c:89
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -212,43 +217,43 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 "\n"
 
-#: src/mcrypt.c:133
+#: src/mcrypt.c:132
 #, fuzzy, c-format
 msgid "Mcrypt v.%s (%s-%s-%s)\n"
 msgstr "Mini-crypt v.%s (%s-%s-%s)\n"
 
-#: src/mcrypt.c:135
+#: src/mcrypt.c:134
 #, c-format
 msgid "Linked against libmcrypt v.%s\n"
 msgstr ""
 
-#: src/mcrypt.c:139
+#: src/mcrypt.c:138
 #, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
 msgstr "Copyright (C) 1998,1999 Nikos Mavroyanopoulos <nmav@hellug.gr>.\n"
 
-#: src/mcrypt.c:152
+#: src/mcrypt.c:151
 #, fuzzy
 msgid "The specified key size is too large for this algorithm.\n"
 msgstr "Ostrzeenie: klucz zbyt krtki dla wybranego algorytmu.\n"
 
-#: src/mcrypt.c:177
+#: src/mcrypt.c:176
 #, fuzzy
 msgid "The specified key size not valid for this algorithm.\n"
 msgstr "Ostrzeenie: klucz zbyt krtki dla wybranego algorytmu.\n"
 
-#: src/mcrypt.c:214 src/mcrypt.c:266
+#: src/mcrypt.c:213 src/mcrypt.c:265
 #, fuzzy
 msgid "Error in the arguments. Use the --help parameter for more info.\n"
 msgstr ""
 "Naley przekierowa wejcie.\n"
 "Parametr --help poda wicej informacji.\n"
 
-#: src/mcrypt.c:219
+#: src/mcrypt.c:218
 msgid "Warning: Cannot access config file.\n"
 msgstr "Ostrzeenie: Dostp do pliku konfiguracyjnego niemoliwy.\n"
 
-#: src/mcrypt.c:235
+#: src/mcrypt.c:234
 #, fuzzy
 msgid ""
 "Error in the configuration file. Use the --help parameter for more info.\n"
@@ -256,52 +261,52 @@ msgstr ""
 "Naley przekierowa wejcie.\n"
 "Parametr --help poda wicej informacji.\n"
 
-#: src/mcrypt.c:336
+#: src/mcrypt.c:335
 #, c-format
 msgid "The '%s' hash algorithm was not found.\n"
 msgstr ""
 
-#: src/mcrypt.c:339
+#: src/mcrypt.c:338
 #, c-format
 msgid "Use the --hashlist parameter to view all supported hashes.\n"
 msgstr ""
 
-#: src/mcrypt.c:379
+#: src/mcrypt.c:378
 msgid "Illegal compression level\n"
 msgstr ""
 
-#: src/mcrypt.c:392
+#: src/mcrypt.c:391
 #, fuzzy, c-format
 msgid "Error in algorithm '%s'.\n"
 msgstr "Brak algorytmu: %s\n"
 
-#: src/mcrypt.c:401 src/mcrypt.c:413
+#: src/mcrypt.c:400 src/mcrypt.c:412
 #, fuzzy, c-format
 msgid "Error in mode '%s'.\n"
 msgstr "Bd w argumentach.\n"
 
-#: src/mcrypt.c:427
+#: src/mcrypt.c:426
 msgid "Warning: It is insecure to specify keywords in the command line\n"
 msgstr "Ostrzeenie: Podawanue hase w linii polece nie jest bezpieczne.\n"
 
-#: src/mcrypt.c:436
+#: src/mcrypt.c:435
 #, fuzzy
 msgid ""
 "Warning: This system does not have a random device. Will use the included "
 "entropy gatherer.\n"
 msgstr "Ostrzeenie: Ten system nie udostpnia rda prawdziwej losowoci.\n"
 
-#: src/mcrypt.c:487
+#: src/mcrypt.c:486
 #, c-format
 msgid "%s: %s is not a regular file. Skipping...\n"
 msgstr "%s: %s nie jest zwykym plikiem. Pominity...\n"
 
-#: src/mcrypt.c:506
+#: src/mcrypt.c:505
 #, c-format
 msgid "%s: Encrypted data will not be read from a terminal.\n"
 msgstr "%s: Zaszyfrowane dane nie bd odczytywane z terminala.\n"
 
-#: src/mcrypt.c:510
+#: src/mcrypt.c:509
 msgid ""
 "Redirect the input instead.\n"
 "Use the --help parameter for more help.\n"
@@ -309,12 +314,12 @@ msgstr ""
 "Naley przekierowa wejcie.\n"
 "Parametr --help poda wicej informacji.\n"
 
-#: src/mcrypt.c:525
+#: src/mcrypt.c:524
 #, c-format
 msgid "%s: Encrypted data will not be written to a terminal.\n"
 msgstr "%s: Zaszyfrowane dane nie bd wypisywane na terminal.\n"
 
-#: src/mcrypt.c:529
+#: src/mcrypt.c:528
 msgid ""
 "Redirect the output instead.\n"
 "Use the --help parameter for more help.\n"
@@ -322,59 +327,59 @@ msgstr ""
 "Naley przekierowa wyjcie.\n"
 "Parametr --help poda wicej informacji.\n"
 
-#: src/mcrypt.c:549
+#: src/mcrypt.c:548
 #, fuzzy, c-format
 msgid "%s: file %s has the .nc suffix... skipping...\n"
 msgstr "%s: plik %s ma kocwk .enc ... pominity...\n"
 
-#: src/mcrypt.c:593
+#: src/mcrypt.c:592
 #, fuzzy, c-format
 msgid "File %s was decrypted.\n"
 msgstr "Plik %s rozszyfrowany.\n"
 
-#: src/mcrypt.c:596
+#: src/mcrypt.c:595
 #, fuzzy, c-format
 msgid "Stdin was decrypted.\n"
 msgstr "Strumie wejciowy rozszyfrowany.\n"
 
-#: src/mcrypt.c:615
+#: src/mcrypt.c:614
 #, c-format
 msgid "File %s was NOT decrypted successfully.\n"
 msgstr "Plik %s NIE zosta poprawnie rozszyfrowany.\n"
 
-#: src/mcrypt.c:625
+#: src/mcrypt.c:624
 msgid "Stdin was NOT decrypted successfully.\n"
 msgstr "Strumie wejciowy NIE zosta poprawnie rozszyfrowany.\n"
 
-#: src/mcrypt.c:639
+#: src/mcrypt.c:638
 #, fuzzy, c-format
 msgid "File %s was encrypted.\n"
 msgstr "Plik %s zaszyfrowany.\n"
 
-#: src/mcrypt.c:642
+#: src/mcrypt.c:641
 #, fuzzy, c-format
 msgid "Stdin was encrypted.\n"
 msgstr "Strumie wejciowy zaszyfrowany.\n"
 
-#: src/mcrypt.c:660
+#: src/mcrypt.c:659
 #, c-format
 msgid "File %s was NOT encrypted successfully.\n"
 msgstr "Plik %s NIE zosta poprawnie zaszyfrowany.\n"
 
-#: src/mcrypt.c:670
+#: src/mcrypt.c:669
 msgid "Stdin was NOT encrypted successfully.\n"
 msgstr "Strumie wejciowy NIE zosta poprawnie zaszyfrowany.\n"
 
-#: src/mcrypt.c:732
+#: src/mcrypt.c:731
 msgid "Unknown suffix. Will append '.dc'.\n"
 msgstr ""
 
-#: src/keys.c:133
+#: src/keys.c:131
 msgid "Key transformation failed.\n"
 msgstr ""
 
-#: src/xmalloc.c:37 src/xmalloc.c:55 src/xmalloc.c:72 src/xmalloc.c:91
-#: src/xmalloc.c:107 src/xmalloc.c:124 src/xmalloc.c:146
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
 #, c-format
 msgid "Cannot allocate memory\n"
 msgstr "Nie mona uzyska przydziau pamici.\n"
@@ -685,19 +690,19 @@ msgstr ""
 msgid "could not fdopen child stdout pipe!\n"
 msgstr ""
 
-#: src/random.c:94
+#: src/random.c:92
 msgid "mhash_init() failed."
 msgstr ""
 
-#: src/random.c:124
+#: src/random.c:122
 msgid "Error while reading random data\n"
 msgstr ""
 
-#: src/random.c:148 src/classic.c:118 src/classic.c:533
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
 msgid "Mcrypt failed to open module.\n"
 msgstr ""
 
-#: src/random.c:151
+#: src/random.c:149
 msgid "Mcrypt failed to initialize cipher.\n"
 msgstr ""
 
--- /dev/null
+++ mcrypt-2.6.8/po/sv.po
@@ -0,0 +1,772 @@
+# Swedish translation of mcrypt.
+# Copyright (C) 2006 Nikos Mavroyanopoulos
+# This file is distributed under the same license as the mcrypt package.
+# Daniel Nylander <po@danielnylander.se>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mcrypt 2.6.4-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-01-12 16:06+0000\n"
+"PO-Revision-Date: 2006-02-02 23:52+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/extra.c:96
+#, c-format
+msgid "Keywords do not match or they are too long.\n"
+msgstr "Nyckelorden stmmer inte verens eller s r de fr lnga.\n"
+
+#: src/extra.c:111
+#, c-format
+msgid "Enter passphrase: "
+msgstr "Ange lsenfras: "
+
+#: src/extra.c:116
+#, c-format
+msgid "Enter the passphrase (maximum of %d characters)\n"
+msgstr "Ange lsenfrasen (maximalt %d tecken)\n"
+
+#: src/extra.c:120
+#, c-format
+msgid "Please use a combination of upper and lower case letters and numbers.\n"
+msgstr "Anvnd en kombination av gemener och versaler samt siffror.\n"
+
+#: src/extra.c:187 src/extra.c:192 src/extra.c:197 src/extra.c:202
+#: src/extra.c:207 src/extra.c:212
+msgid "Unsupported version of encrypted file\n"
+msgstr "Krypterad fil anvnder en version som inte stds\n"
+
+#: src/extra.c:218
+msgid "No Initialization vector was used.\n"
+msgstr "Ingen initieringsvektor anvndes.\n"
+
+#: src/extra.c:246
+msgid "Salt is too long\n"
+msgstr ""
+
+#: src/extra.c:263
+msgid ""
+"This is a file encrypted with the 2.2 version of mcrypt. Unfortunately "
+"you'll need that version to decrypt it.\n"
+msgstr ""
+"Detta r en fil som r krypterad med version 2.2 av mcrypt. Tyvrr behver "
+"du den versionen fr att dekryptera den.\n"
+
+#: src/extra.c:268
+msgid ""
+"This is a file encrypted with the 2.1 version of mcrypt. Unfortunately "
+"you'll need that version to decrypt it.\n"
+msgstr ""
+"Detta r en fil som r krypterad med version 2.1 av mcrypt. Tyvrr behver "
+"du den versionen fr att dekryptera den.\n"
+
+#: src/extra.c:272
+msgid ""
+"Unable to get algorithm information. Use the --bare flag and specify the "
+"algorithm manually.\n"
+msgstr ""
+"Kunde inte hmta algoritminformation. Anvnd flaggan --bare och ange "
+"algoritmen manuellt.\n"
+
+#: src/extra.c:454
+#, c-format
+msgid "Signal %d caught. Exiting.\n"
+msgstr "Signal %d fngad. Avslutar.\n"
+
+#: src/extra.c:466
+#, c-format
+msgid ""
+"\n"
+"Signal %d caught. Exiting.\n"
+msgstr ""
+"\n"
+"Signal %d fngad. Avslutar.\n"
+
+#: src/extra.c:492
+#, c-format
+msgid "Keyfile could not be opened. Ignoring it.\n"
+msgstr "Nyckelfil kunde inte ppnas. Ignorerar den.\n"
+
+#: src/extra.c:555
+#, c-format
+msgid "%s: %s already exists; do you wish to overwrite (y or n)?"
+msgstr "%s: %s existerar redan; vill du skriva ver den (y eller n)?"
+
+#: src/extra.c:617
+msgid "Could not push character back to stream\n"
+msgstr "Kunde inte lmna tillbaka tecken till strm\n"
+
+#: src/extra.c:625
+msgid "Could not open file\n"
+msgstr "Kunde inte ppna fil\n"
+
+#: src/extra.c:638
+msgid "An OpenPGP encrypted file has been detected.\n"
+msgstr "En OpenPGP-krypterad fil har identifierats.\n"
+
+#: src/extra.c:653
+#, c-format
+msgid ""
+"Algorithm: %s\n"
+"Keysize: %d\n"
+"Mode: %s\n"
+"Keyword mode: %s\n"
+msgstr ""
+"Algoritm: %s\n"
+"Nyckelstorlek: %d\n"
+"Lge: %s\n"
+"Nyckelordslge: %s\n"
+
+#: src/extra.c:661
+#, c-format
+msgid "File format: %s\n"
+msgstr "Filformat: %s\n"
+
+#: src/extra.c:666
+#, c-format
+msgid "Input File: %s\n"
+msgstr "Indatafil: %s\n"
+
+#: src/extra.c:669
+#, c-format
+msgid "Output File: %s\n"
+msgstr "Utdatafil: %s\n"
+
+#: src/extra.c:714
+#, c-format
+msgid "Time needed: "
+msgstr "Tid som behvs: "
+
+#: src/extra.c:717
+#, c-format
+msgid "%lu hours"
+msgstr "%lu timmar"
+
+#: src/extra.c:724
+#, c-format
+msgid "%lu minutes"
+msgstr "%lu minuter"
+
+#: src/extra.c:731
+#, c-format
+msgid "%lu seconds"
+msgstr "%lu sekunder"
+
+#: src/extra.c:738
+#, c-format
+msgid "%lu milliseconds"
+msgstr "%lu millisekunder"
+
+#: src/extra.c:743
+#, c-format
+msgid "Wow, no time counted!\n"
+msgstr "Wow, ingen tid berknad!\n"
+
+#: src/extra.c:750
+#, c-format
+msgid ""
+"Processed %.3f MB, at a %.3f MB/sec rate (1 MB == 1000000 Bytes).\n"
+"\n"
+msgstr ""
+"Behandlade %.3f MB med en hastighet av %.3f MB/sek (1 MB == 1000000 byte).\n"
+"\n"
+
+#: src/extra.c:757
+#, c-format
+msgid ""
+"Processed %.3f KB, at a %.3f KB/sec rate (1 KB == 1000 Bytes).\n"
+"\n"
+msgstr ""
+"Behandlade %.3f KB med en hastighet av %.3f KB/sek (1 KB == 1000 byte).\n"
+"\n"
+
+#: src/mcrypt.c:79
+#, c-format
+msgid ""
+"\n"
+"Report bugs to mcrypt-dev@lists.hellug.gr.\n"
+"\n"
+msgstr ""
+"\n"
+"Rapportera fel till mcrypt-dev@lists.hellug.gr.\n"
+"Skicka synpunkter p versttningen till tp-sv@listor.tp-sv.se\n"
+"\n"
+
+#: src/mcrypt.c:89
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 1998-2002 Nikos Mavroyanopoulos\n"
+"This program is free software; you can redistribute it and/or modify \n"
+"it under the terms of the GNU General Public License as published by \n"
+"the Free Software Foundation; either version 2 of the License, or \n"
+"(at your option) any later version. \n"
+"\n"
+"This program is distributed in the hope that it will be useful, \n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of \n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n"
+"GNU General Public License for more details. \n"
+"\n"
+"You should have received a copy of the GNU General Public License \n"
+"along with this program; if not, write to the Free Software \n"
+"Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
+"\n"
+msgstr ""
+"\n"
+"Copyright (C) 1998-2002 Nikos Mavroyanopoulos\n"
+"Detta program r fri programvara. Du kan distribuera det och/eller\n"
+"modifiera det under villkoren i GNU General Public License, publicerad\n"
+"av Free Software Foundation, antingen version 2 eller (om du s vill)\n"
+"ngon senare version.\n"
+"\n"
+"Detta program distribueras i hopp om att det ska vara anvndbart,\n"
+"men UTAN NGON SOM HELST GARANTI, ven utan underfrstdd garanti\n"
+"om SLJBARHET eller LMPLIGHET FR NGOT SPECIELLT NDAML. Se\n"
+"GNU General Public License fr ytterligare information.\n"
+"\n"
+"Du br ha ftt en kopia av GNU General Public License tillsammans\n"
+"med detta program. Om inte, skriv till Free Software Foundation,\n"
+"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+
+#: src/mcrypt.c:132
+#, c-format
+msgid "Mcrypt v.%s (%s-%s-%s)\n"
+msgstr "Mcrypt v.%s (%s-%s-%s)\n"
+
+#: src/mcrypt.c:134
+#, c-format
+msgid "Linked against libmcrypt v.%s\n"
+msgstr "Lnkad mot libmcrypt v.%s\n"
+
+#: src/mcrypt.c:138
+#, c-format
+msgid "Copyright (C) 1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
+msgstr "Copyright  1998-2002 Nikos Mavroyanopoulos (nmav@gnutls.org)\n"
+
+#: src/mcrypt.c:151
+msgid "The specified key size is too large for this algorithm.\n"
+msgstr "Den angivna nyckelstorleket r fr stor fr denna algoritm.\n"
+
+#: src/mcrypt.c:176
+msgid "The specified key size not valid for this algorithm.\n"
+msgstr "Den angivna nyckelstorleken r inte giltig fr denna algoritm.\n"
+
+#: src/mcrypt.c:213 src/mcrypt.c:265
+msgid "Error in the arguments. Use the --help parameter for more info.\n"
+msgstr "Fel i argumenten. Anvnd parametern --help fr mer information.\n"
+
+#: src/mcrypt.c:218
+msgid "Warning: Cannot access config file.\n"
+msgstr "Varning: Kan inte komma t konfigurationsfil.\n"
+
+#: src/mcrypt.c:234
+msgid ""
+"Error in the configuration file. Use the --help parameter for more info.\n"
+msgstr ""
+"Fel i konfigurationsfilen. Anvnd parametern --help fr mer information.\n"
+
+#: src/mcrypt.c:335
+#, c-format
+msgid "The '%s' hash algorithm was not found.\n"
+msgstr "Algoritmen \"%s\" hittades inte.\n"
+
+#: src/mcrypt.c:338
+#, c-format
+msgid "Use the --hashlist parameter to view all supported hashes.\n"
+msgstr "Anvnd parametern --hashlist fr att visa alla hash som stds.\n"
+
+#: src/mcrypt.c:378
+msgid "Illegal compression level\n"
+msgstr "Otillten komprimeringsniv\n"
+
+#: src/mcrypt.c:391
+#, c-format
+msgid "Error in algorithm '%s'.\n"
+msgstr "Fel i algoritm \"%s\".\n"
+
+#: src/mcrypt.c:400 src/mcrypt.c:412
+#, c-format
+msgid "Error in mode '%s'.\n"
+msgstr "Fel i lge \"%s\".\n"
+
+#: src/mcrypt.c:426
+msgid "Warning: It is insecure to specify keywords in the command line\n"
+msgstr "Varning: Det r oskert att ange nyckelord p kommandoraden\n"
+
+#: src/mcrypt.c:435
+msgid ""
+"Warning: This system does not have a random device. Will use the included "
+"entropy gatherer.\n"
+msgstr ""
+"Varning: Detta system har ingen slumpenhet. Kommer att anvnda den "
+"inkluderade entropisamlaren.\n"
+
+#: src/mcrypt.c:486
+#, c-format
+msgid "%s: %s is not a regular file. Skipping...\n"
+msgstr "%s: %s r inte en vanlig fil. Hoppar ver...\n"
+
+#: src/mcrypt.c:505
+#, c-format
+msgid "%s: Encrypted data will not be read from a terminal.\n"
+msgstr "%s: Krypterat data kommer inte att lsas frn en terminal.\n"
+
+#: src/mcrypt.c:509
+msgid ""
+"Redirect the input instead.\n"
+"Use the --help parameter for more help.\n"
+msgstr ""
+"Omdirigerar inmatning istllet.\n"
+"Anvnd parametern --help fr mer hjlp.\n"
+
+#: src/mcrypt.c:524
+#, c-format
+msgid "%s: Encrypted data will not be written to a terminal.\n"
+msgstr "%s: Krypterad data kommer inte att skrivas till en terminal.\n"
+
+#: src/mcrypt.c:528
+msgid ""
+"Redirect the output instead.\n"
+"Use the --help parameter for more help.\n"
+msgstr ""
+"Omdirigera utdata istllet.\n"
+"Anvnd parametern --help fr mer hjlp.\n"
+
+#: src/mcrypt.c:548
+#, c-format
+msgid "%s: file %s has the .nc suffix... skipping...\n"
+msgstr "%s: fil %s har ndelsen .nc ... hoppar ver...\n"
+
+#: src/mcrypt.c:592
+#, c-format
+msgid "File %s was decrypted.\n"
+msgstr "Fil %s blev dekrypterad.\n"
+
+#: src/mcrypt.c:595
+#, c-format
+msgid "Stdin was decrypted.\n"
+msgstr "Standard in blev dekrypterad.\n"
+
+#: src/mcrypt.c:614
+#, c-format
+msgid "File %s was NOT decrypted successfully.\n"
+msgstr "Fil %s blev INTE dekrypterad.\n"
+
+#: src/mcrypt.c:624
+msgid "Stdin was NOT decrypted successfully.\n"
+msgstr "Standard in blev INTE dekrypterad.\n"
+
+#: src/mcrypt.c:638
+#, c-format
+msgid "File %s was encrypted.\n"
+msgstr "Fil %s var krypterad.\n"
+
+#: src/mcrypt.c:641
+#, c-format
+msgid "Stdin was encrypted.\n"
+msgstr "Standard in var krypterad.\n"
+
+#: src/mcrypt.c:659
+#, c-format
+msgid "File %s was NOT encrypted successfully.\n"
+msgstr "Fil %s blev INTE krypterad.\n"
+
+#: src/mcrypt.c:669
+msgid "Stdin was NOT encrypted successfully.\n"
+msgstr "Standard in blev INTE krypterad.\n"
+
+#: src/mcrypt.c:731
+msgid "Unknown suffix. Will append '.dc'.\n"
+msgstr "Oknd ndelse. Kommer att lgga till \".dc\".\n"
+
+#: src/keys.c:131
+msgid "Key transformation failed.\n"
+msgstr "Nyckeltransformering misslyckades.\n"
+
+#: src/xmalloc.c:35 src/xmalloc.c:53 src/xmalloc.c:70 src/xmalloc.c:89
+#: src/xmalloc.c:105 src/xmalloc.c:122 src/xmalloc.c:144
+#, c-format
+msgid "Cannot allocate memory\n"
+msgstr "Kan inte allokera minne\n"
+
+#: mcrypt.gaa:120
+#, c-format
+msgid ""
+"Mcrypt encrypts and decrypts files with symmetric encryption algorithms.\n"
+"Usage: mcrypt [-dFusgbhLvrzp] [-f keyfile] [-k key1 key2 ...] [-m mode] [-o "
+"keymode] [-s keysize] [-a algorithm] [-c config_file] [file ...]\n"
+"\n"
+msgstr ""
+"Mcrypt krypterar och dekrypterar filer med  symmetriska "
+"krypteringsalgoritmer.\n"
+"Anvndning: mcrypt [-dFusgbhLvrzp] [-f nyckelfil] [-k nyckel1 nyckel2 ...] [-"
+"m lge] [-o nyckellge] [-s nyckelstorlek] [-a algoritm] [-c konfigfil] "
+"[fil ...]\n"
+"\n"
+
+#: mcrypt.gaa:121
+msgid "Use the OpenPGP (RFC2440) file format."
+msgstr "Anvnd filformat fr OpenPGP (RFC2440)."
+
+#: mcrypt.gaa:122
+#, fuzzy
+msgid "Use the native (mcrypt) file format."
+msgstr "Anvnd filformat fr OpenPGP (RFC2440)."
+
+#: mcrypt.gaa:123 mcrypt.gaa:125
+msgid "INTEGER "
+msgstr "HELTAL"
+
+#: mcrypt.gaa:123
+msgid "Sets the compression level for openpgp packets (0 disables)."
+msgstr "Stller in komprimeringsnivn fr openpgp-paket (0 stnger av)."
+
+#: mcrypt.gaa:124
+msgid "decrypts."
+msgstr "dekrypterar."
+
+#: mcrypt.gaa:125
+msgid "Set the algorithm's key size (in bytes)."
+msgstr "Stller in algoritmens nyckelstorlek (i byte)."
+
+#: mcrypt.gaa:126
+msgid "KEYMODE "
+msgstr "NYCKELLGE"
+
+#: mcrypt.gaa:126
+msgid ""
+"Specify the keyword mode. Use the --list-keymodes parameter to view all "
+"modes."
+msgstr ""
+"Ange nyckelordslge. Anvnd parametern --list-keymodes fr att visa alla "
+"lgen."
+
+#: mcrypt.gaa:127 mcrypt.gaa:128
+msgid "FILE "
+msgstr "FIL"
+
+#: mcrypt.gaa:127
+msgid "Specify the file to read the keyword from."
+msgstr "Ange filen att lsa nyckelordet frn."
+
+#: mcrypt.gaa:128
+msgid "Use configuration file FILE."
+msgstr "Anvnd konfigurationsfil FIL."
+
+#: mcrypt.gaa:129
+msgid "ALGORITHM "
+msgstr "ALGORITM "
+
+#: mcrypt.gaa:129
+msgid ""
+"Specify the encryption and decryption algorithm. Use the --list parameter to "
+"see the supported algorithms."
+msgstr ""
+"Ange kryptering- och dekrypteringsalgoritm. Anvnd parametern --list fr att "
+"se de algoritmer som stds."
+
+#: mcrypt.gaa:130 mcrypt.gaa:132
+msgid "DIRECTORY "
+msgstr "KATALOG"
+
+#: mcrypt.gaa:130
+msgid "Set the algorithms directory."
+msgstr "Stll in algoritmkatalogen."
+
+#: mcrypt.gaa:131
+msgid "MODE "
+msgstr "LGE"
+
+#: mcrypt.gaa:131
+msgid ""
+"Specify the encryption and decryption mode. Use the --list parameter to see "
+"the supported modes."
+msgstr ""
+"Ange kryptering- och dekrypteringslge. Anvnd parametern --list fr att se "
+"de lgen som stds."
+
+#: mcrypt.gaa:132
+msgid "Set the modes directory."
+msgstr "Stll in katalog fr lgen."
+
+#: mcrypt.gaa:133
+msgid "HASH "
+msgstr "HASH "
+
+#: mcrypt.gaa:133
+msgid ""
+"Specify the hash algorithm to be used. Use the --list-hash parameter to view "
+"the hash algorithms."
+msgstr ""
+"Ange hashalgoritm som ska anvndas. Anvnd parametern --list-hash fr att se "
+"hashalgoritmer."
+
+#: mcrypt.gaa:134
+msgid "KEY1 KEY2...KEYN "
+msgstr "NYCKEL1 NYCKEL2...NYCKELN "
+
+#: mcrypt.gaa:134
+msgid "Specify the key(s)"
+msgstr "Ange nyckel/nycklar"
+
+#: mcrypt.gaa:135
+msgid "Do not use an IV."
+msgstr "Anvnd inte ett IV."
+
+#: mcrypt.gaa:136
+msgid "Do not keep algorithm information in the encrypted file."
+msgstr "Lagra inte algoritminformation i den krypterade filen."
+
+#: mcrypt.gaa:137
+msgid "Use gzip to compress files before encryption."
+msgstr "Anvnd gzip fr att komprimera filer fre kryptering."
+
+#: mcrypt.gaa:138
+msgid "Use bzip2 to compress files before encryption."
+msgstr "Anvnd bzip2 fr att komprimera filer fre kryptering."
+
+#: mcrypt.gaa:139
+msgid "Immediately flush the output"
+msgstr "Spola omedelbart utdata"
+
+#: mcrypt.gaa:140
+msgid "Double check passwords."
+msgstr "Dubbelkontrollerar lsenord."
+
+#: mcrypt.gaa:141
+msgid "Unlink the input file after encryption or decryption."
+msgstr "Avlnka inmatningsfil efter kryptering eller dekryptering."
+
+#: mcrypt.gaa:142
+msgid "Do not delete the output file if decryption failed."
+msgstr "Ta inte bort utdatafil om dekryptering misslyckas."
+
+#: mcrypt.gaa:143
+msgid "Prints timing information."
+msgstr "Skriver ut tidsinformation."
+
+#: mcrypt.gaa:144
+msgid "Forces output to stdout."
+msgstr "Tvingar utskrift till standard ut."
+
+#: mcrypt.gaa:145
+msgid "Echo asterisks when entering the password."
+msgstr "Eka stjrnor nr lsenordet anges."
+
+#: mcrypt.gaa:146
+msgid "Use real random data (if your system supports it)."
+msgstr "Anvnd riktigt slumpad data (om ditt system har std fr det)."
+
+#: mcrypt.gaa:147
+msgid "Prints a list of the supported algorithms and modes."
+msgstr "Skriver ut en lista av algoritmer och lgen som stds."
+
+#: mcrypt.gaa:148
+msgid "Prints a list of the supported key modes."
+msgstr "Skriver ut en lista av nyckellgen som stds."
+
+#: mcrypt.gaa:149
+msgid "Prints a list of the supported hash algorithms."
+msgstr "Skriver ut en lista av hash-algoritmer som stds."
+
+#: mcrypt.gaa:150
+msgid "More information is displayed."
+msgstr "Mer information visas."
+
+#: mcrypt.gaa:151
+msgid "Suppress some non critical warnings."
+msgstr "Tysta ned vissa icke-kritiska varningar."
+
+#: mcrypt.gaa:152
+msgid "Prints this help"
+msgstr "Skriver ut denna hjlp"
+
+#: mcrypt.gaa:153
+msgid "Prints the version number"
+msgstr "Skriver ut versionsnumret"
+
+#: mcrypt.gaa:154
+msgid "Displays license information."
+msgstr "Visar licensinformation."
+
+#: src/rfc2440.c:315
+#, c-format
+msgid "Algorithm %s is not available in OpenPGP encryption.\n"
+msgstr "Algoritm %s r inte tillgnglig i OpenPGP-kryptering.\n"
+
+#: src/rfc2440.c:317
+#, c-format
+msgid "%s will be used instead.\n"
+msgstr "%s kommer att anvndas istllet.\n"
+
+#: src/rfc2440.c:568 src/rfc2440.c:619
+msgid "mhash_keygen_ext() failed.\n"
+msgstr "mhash_keygen_ext() misslyckades.\n"
+
+#: src/rfc2440.c:571 src/rfc2440.c:622
+msgid "Could not open module\n"
+msgstr "Kunde inte ppna modul\n"
+
+#: src/rfc2440.c:601
+#, c-format
+msgid "OpenPGP: Unsupported key mode %s\n"
+msgstr "OpenPGP: Nyckellget %s stds inte\n"
+
+#: src/rfc2440.c:756 src/rfc2440.c:805
+msgid "mcrypt_generic_init() failed\n"
+msgstr "mcrypt_generic_init() misslyckades\n"
+
+#: src/rfc2440.c:768
+msgid "decryption: wrong key.\n"
+msgstr "dekryptering: fel nyckel.\n"
+
+#: src/rfc2440.c:878 src/rfc2440.c:966
+#, c-format
+msgid "zlib error `%s'.\n"
+msgstr "zlib-fel \"%s\".\n"
+
+#: src/rfc2440.c:879
+#, c-format
+msgid "compress: deflate returned %d.\n"
+msgstr "compress: deflate svarade %d.\n"
+
+#: src/rfc2440.c:967
+#, c-format
+msgid "uncompress: inflate returned %d.\n"
+msgstr "uncompress: inflate svarade %d.\n"
+
+#: src/rfc2440.c:999
+msgid "Will decompress input file.\n"
+msgstr "Kommer att packa upp inmatningsfil.\n"
+
+#: src/rfc2440.c:1055
+msgid "Output file will be compressed.\n"
+msgstr "Utdatafil kommer att komprimeras.\n"
+
+#: src/rfc2440.c:1165
+msgid "Unsupported OpenPGP packet!\n"
+msgstr ""
+
+#: src/popen.c:64 src/popen.c:74
+#, c-format
+msgid "command string is not correct!\n"
+msgstr "kommandostrng r inte korrekt!\n"
+
+#: src/popen.c:87 src/popen.c:90
+#, c-format
+msgid "could not create pipe\n"
+msgstr "kunde inte skapa rr\n"
+
+#: src/popen.c:95
+#, c-format
+msgid "could not fork child process\n"
+msgstr "kunde inte grena barnprocess\n"
+
+#: src/popen.c:102
+#, c-format
+msgid "could not close write-access of child stdin!\n"
+msgstr "kunde inte stnga skrivtillgng fr barnets standard in!\n"
+
+#: src/popen.c:104
+#, c-format
+msgid "could not dup2 child stdin!\n"
+msgstr "kunde inte kopiera filidentifierare frn barnets standard in!\n"
+
+#: src/popen.c:106 src/popen.c:123
+#, c-format
+msgid "could not close read-access of child stdin!\n"
+msgstr "kunde inte stnga lstillgng fr barnets standard in!\n"
+
+#: src/popen.c:111
+#, c-format
+msgid "could not close read-access of child stdout!\n"
+msgstr "kunde inte stnga lstillgng fr barnets standard ut!\n"
+
+#: src/popen.c:113
+#, c-format
+msgid "could not dup2 child stdout!\n"
+msgstr "kunde inte kopiera filidentifierare till barnets standard ut!\n"
+
+#: src/popen.c:115 src/popen.c:129
+#, c-format
+msgid "could not close write-access of child stdout!\n"
+msgstr "kunde inte stnga skrivtillgng fr barnets standard ut!\n"
+
+#: src/popen.c:125
+#, c-format
+msgid "could not fdopen child stdin pipe!\n"
+msgstr "kunde inte ppna barnets filidentifierare frn standard in-rret!\n"
+
+#: src/popen.c:131
+#, c-format
+msgid "could not fdopen child stdout pipe!\n"
+msgstr "kunde inte ppna barnets filidentifierare till standard ut-rret!\n"
+
+#: src/random.c:92
+msgid "mhash_init() failed."
+msgstr "mhash_init() misslyckades."
+
+#: src/random.c:122
+msgid "Error while reading random data\n"
+msgstr "Fel vid lsning av slumpad data\n"
+
+#: src/random.c:146 src/classic.c:118 src/classic.c:533
+msgid "Mcrypt failed to open module.\n"
+msgstr "Mcrypt misslyckades att ppna modul.\n"
+
+#: src/random.c:149
+msgid "Mcrypt failed to initialize cipher.\n"
+msgstr "Mcrypt misslyckades att initiera skiffer.\n"
+
+#: src/rndunix.c:827
+msgid "Child had pid 0!"
+msgstr "Barn hade pid 0!"
+
+#: src/classic.c:227
+#, c-format
+msgid "Error in keymode '%s'.\n"
+msgstr "Fel i nyckellge \"%s\".\n"
+
+#: src/classic.c:284 src/classic.c:589
+msgid "mhash initialization failed.\n"
+msgstr "initiering av mhash misslyckades.\n"
+
+#: src/classic.c:361
+msgid "Memory error\n"
+msgstr "Minnesfel\n"
+
+#: src/classic.c:513
+msgid "No valid file headers found.\n"
+msgstr "Inga giltiga filhuvuden hittade.\n"
+
+#: src/classic.c:644 src/classic.c:717
+msgid "Corrupted file.\n"
+msgstr "Skadad fil.\n"
+
+#: src/classic.c:663
+#, c-format
+msgid "Unexpected error [%d]\n"
+msgstr "Ovntat fel [%d]\n"
+
+#: src/classic.c:909 src/classic.c:918
+msgid "Decompressing the output file...\n"
+msgstr "Packar upp utdatafil...\n"
+
+#: src/classic.c:941
+#, c-format
+msgid "%s check failed\n"
+msgstr "%s kontroll misslyckades\n"
+
+#: src/classic.c:1054
+#, c-format
+msgid "Supported Hash Algorithms:\n"
+msgstr "Hash-algoritmer som stds:\n"
+
+#~ msgid "Signatures can't be checked!\n"
+#~ msgstr "Signaturer kan inte kontrolleras!\n"
--- mcrypt-2.6.8.orig/src/Makefile.am
+++ mcrypt-2.6.8/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -I../intl
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I../intl
 bin_PROGRAMS = mcrypt
 EXTRA_DIST = crypt defines.h errors.h gaa.h keys.h random.h \
        extra.h getpass.h environ.h ufc_crypt.h rfc2440.h \
@@ -13,6 +13,6 @@ mcrypt_SOURCES = extra.c mcrypt.c keys.c
 localedir = $(datadir)/locale
 mcrypt_LDADD = gaaout.o @LIBINTL@ 
 gaaout.o: gaaout.c
-	$(CC) -o gaaout.o -c gaaout.c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -I. -I..
+	$(CC) -o gaaout.o -c gaaout.c $(AM_CPPFLAGS) $(CFLAGS) $(CPPFLAGS) -I. -I..
 gaaout.c: mcrypt.gaa
 	gaa -o gaaout.c -i gaa.h mcrypt.gaa
--- mcrypt-2.6.8.orig/src/classic.c
+++ mcrypt-2.6.8/src/classic.c
@@ -437,7 +437,7 @@ decrypt_general(char *algorithm, char *f
    char tmp_buf[BUFFER_SIZE];
    int how = 0;
    int i = 0;
-   int blocksize, crcsize, salt_size;
+   int blocksize, crcsize, salt_size = 0;
    MCRYPT td;
    int pid, buf_block, start;
    word32 *IV = NULL;
--- mcrypt-2.6.8.orig/src/defines.h
+++ mcrypt-2.6.8/src/defines.h
@@ -2,6 +2,7 @@
 # define IDEFINES_H
 
 #include <config.h>
+#include "mcrypt_int.h"
 
 /* #define DEBUG Don't even think defining it:) */
 
--- mcrypt-2.6.8.orig/src/environ.c
+++ mcrypt-2.6.8/src/environ.c
@@ -25,8 +25,6 @@
 #include <extra.h>
 #include <xmalloc.h>
 
-static char rcsid[] = "$Id: environ.c,v 1.2 2007/11/07 17:10:19 nmav Exp $";
-
 int check_env()
 {
 
--- mcrypt-2.6.8.orig/src/errors.c
+++ mcrypt-2.6.8/src/errors.c
@@ -24,24 +24,24 @@ extern int quiet;
 
 void err_quit(char *errmsg)
 {
-	fprintf(stderr, errmsg);
+	fprintf(stderr, "%s", errmsg);
 	exit(-1);
 }
 
 void err_warn(char *errmsg)
 {
 	if (quiet <= 1)
-		fprintf(stderr, errmsg);
+		fprintf(stderr, "%s", errmsg);
 }
 
 void err_info(char *errmsg)
 {
 	if (quiet == 0)
-		fprintf(stderr, errmsg);
+		fprintf(stderr, "%s", errmsg);
 }
 
 void err_crit(char *errmsg)
 {
 	if (quiet <= 2)
-		fprintf(stderr, errmsg);
+		fprintf(stderr, "%s", errmsg);
 }
--- mcrypt-2.6.8.orig/src/extra.c
+++ mcrypt-2.6.8/src/extra.c
@@ -42,9 +42,6 @@
 # include <time.h>
 #endif
 
-static char rcsid[] =
-    "$Id: extra.c,v 1.2 2007/11/07 17:10:20 nmav Exp $";
-
 #ifndef NO_GETPASS
 	#define FREE_STR(x) \
 		_secure_mcrypt_free(x, strlen(x))
@@ -223,7 +220,8 @@ int check_file_head(FILE * fstream, char
 		}
 
 		read_until_null(tmp_buf, fstream);
-		strcpy(algorithm, tmp_buf);
+		strncpy(algorithm, tmp_buf, 50);
+		algorithm[49] = '\0';
 
 		fread(&keylen, sizeof(short int), 1, fstream);
 #ifdef WORDS_BIGENDIAN
@@ -233,15 +231,19 @@ int check_file_head(FILE * fstream, char
 #endif
 
 		read_until_null(tmp_buf, fstream);
-		strcpy(mode, tmp_buf);
+		strncpy(mode, tmp_buf, 50);
+		mode[49] = '\0';
 
 		read_until_null(tmp_buf, fstream);
-		strcpy(keymode, tmp_buf);
+		strncpy(keymode, tmp_buf, 50);
+		keymode[49] = '\0';
 		fread(&sflag, 1, 1, fstream);
 		if (m_getbit(6, flags) == 1) { /* if the salt bit is set */
 			if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
 				*salt_size = m_setbit(0, sflag, 0);
 				if (*salt_size > 0) {
+					if (*salt_size > sizeof(tmp_buf))
+					    err_quit(_("Salt is too long\n"));
 					fread(tmp_buf, 1, *salt_size,
 					      fstream);
 					memmove(salt, tmp_buf, *salt_size);
@@ -267,7 +269,7 @@ int check_file_head(FILE * fstream, char
 			return 1;
 		}
 		err_crit(_
-			 ("Unable to get algorithm information. Use the --bare flag and specify the algorithm manualy.\n"));
+			 ("Unable to get algorithm information. Use the --bare flag and specify the algorithm manually.\n"));
 
 		return 1;
 	}
--- mcrypt-2.6.8.orig/src/gaaout.c
+++ mcrypt-2.6.8/src/gaaout.c
@@ -1036,7 +1036,7 @@ int gaa(int argc, char **argv, gaainfo *
        gaaval->config_file=NULL; gaaval->mode=NULL; gaaval->input=NULL; gaaval->ed_specified=0;
        gaaval->double_check=0; gaaval->noecho=1; gaaval->flush=0; gaaval->keysize=0;
        gaaval->algorithms_directory=NULL; gaaval->modes_directory=NULL; gaaval->nodelete=0;
-       gaaval->hash=NULL; gaaval->timer=0; gaaval->openpgp=1; gaaval->openpgp_z = 0; ;};
+       gaaval->hash=NULL; gaaval->timer=0; gaaval->openpgp=0; gaaval->openpgp_z = 0; ;};
 
     }
     inited = 1;
--- mcrypt-2.6.8.orig/src/getpass.c
+++ mcrypt-2.6.8/src/getpass.c
@@ -28,8 +28,6 @@
  * SUCH DAMAGE.
  */
 
-static char rcsid[] = "$Id: getpass.c,v 1.1.1.1 2003/09/08 17:25:49 imipak Exp $";
-
 /* stdout was replaced with stderr to fit in mcrypt 
  * Also /dev/(u)random is used for random numbers.
  *
@@ -77,7 +75,7 @@ static struct sigaction sigact;
 #endif
 
 /*ARGSUSED */
-static RETSIGTYPE
+static void
  sig_catch(int sig)
 {
 	sig_caught = 1;
@@ -166,7 +164,7 @@ char *
 #ifdef HAVE_SIGACTION
 	struct sigaction old_sigact;
 #else
-	RETSIGTYPE(*old_signal) ();
+	void(*old_signal) ();
 #endif
 	TERMIO new_modes;
 	TERMIO old_modes;
--- mcrypt-2.6.8.orig/src/keys.c
+++ mcrypt-2.6.8/src/keys.c
@@ -26,8 +26,6 @@
 #include <errors.h>
 #include <ufc_crypt.h>
 
-static char rcsid[] = "$Id: keys.c,v 1.2 2007/11/07 17:10:20 nmav Exp $";
-
 int _mcrypt_pgp_conv_keymode( const char* keymode, keygenid* km, hashid *halg) {
 	if (strcasecmp(keymode, "s2k-simple-md5")==0) {
 		*km=KEYGEN_S2K_SIMPLE; 
--- mcrypt-2.6.8.orig/src/mcrypt.c
+++ mcrypt-2.6.8/src/mcrypt.c
@@ -41,8 +41,7 @@
 # include <time.h>
 #endif
 
-static char rcsid[] =
-    "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $";
+#define WIDTH 80
 
 char tmperr[128];
 unsigned int stream_flag = FALSE;
@@ -482,7 +481,7 @@ int main(int argc, char **argv)
 #ifdef HAVE_STAT
       if (stream_flag == FALSE) {
 	 if (is_normal_file(file[i]) == FALSE) {
-	    sprintf(tmperr,
+	    snprintf(tmperr, WIDTH,
 		    _
 		    ("%s: %s is not a regular file. Skipping...\n"),
 		    program_name, file[i]);
@@ -501,7 +500,7 @@ int main(int argc, char **argv)
 	    dinfile = file[i];
 	 if ((isatty(fileno((FILE *) (stdin))) == 1)
 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
-	    sprintf(tmperr,
+	    snprintf(tmperr, WIDTH,
 		    _
 		    ("%s: Encrypted data will not be read from a terminal.\n"),
 		    program_name);
@@ -520,7 +519,7 @@ int main(int argc, char **argv)
 	    einfile = file[i];
 	 if ((isatty(fileno((FILE *) (stdout))) == 1)
 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
-	    sprintf(tmperr,
+	    snprintf(tmperr, WIDTH,
 		    _
 		    ("%s: Encrypted data will not be written to a terminal.\n"),
 		    program_name);
@@ -544,7 +543,7 @@ int main(int argc, char **argv)
 	    strcpy(outfile, einfile);
 	    /* if file has already the .nc ignore it */
 	    if (strstr(outfile, ".nc") != NULL) {
-	       sprintf(tmperr,
+	       snprintf(tmperr, WIDTH,
 		       _
 		       ("%s: file %s has the .nc suffix... skipping...\n"),
 		       program_name, outfile);
@@ -590,10 +589,10 @@ int main(int argc, char **argv)
 
 	 if (x == 0) {
 	    if (stream_flag == FALSE) {
-	       sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
+	       snprintf(tmperr, WIDTH, _("File %s was decrypted.\n"), dinfile);
 	       err_warn(tmperr);
 	    } else {
-	       sprintf(tmperr, _("Stdin was decrypted.\n"));
+	       snprintf(tmperr, WIDTH, _("Stdin was decrypted.\n"));
 	       err_warn(tmperr);
 	    }
 #ifdef HAVE_STAT
@@ -610,7 +609,7 @@ int main(int argc, char **argv)
 
 	 } else {
 	    if (stream_flag == FALSE) {
-	       sprintf(tmperr,
+	       snprintf(tmperr, WIDTH,
 		       _
 		       ("File %s was NOT decrypted successfully.\n"),
 		       dinfile);
@@ -636,10 +635,10 @@ int main(int argc, char **argv)
 
 	 if (x == 0) {
 	    if (stream_flag == FALSE) {
-	       sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
+	       snprintf(tmperr, WIDTH, _("File %s was encrypted.\n"), einfile);
 	       err_warn(tmperr);
 	    } else {
-	       sprintf(tmperr, _("Stdin was encrypted.\n"));
+	       snprintf(tmperr, WIDTH, _("Stdin was encrypted.\n"));
 	       err_warn(tmperr);
 	    }
 #ifdef HAVE_STAT
@@ -655,7 +654,7 @@ int main(int argc, char **argv)
 
 	 } else {
 	    if (stream_flag == FALSE) {
-	       sprintf(tmperr,
+	       snprintf(tmperr, WIDTH,
 		       _
 		       ("File %s was NOT encrypted successfully.\n"),
 		       einfile);
--- mcrypt-2.6.8.orig/src/mcrypt.gaa
+++ mcrypt-2.6.8/src/mcrypt.gaa
@@ -119,7 +119,7 @@ init { $force=0; $quiet=1; $real_random_
        $config_file=NULL; $mode=NULL; $input=NULL; $ed_specified=0;
        $double_check=0; $noecho=1; $flush=0; $keysize=0;
        $algorithms_directory=NULL; $modes_directory=NULL; $nodelete=0;
-       $hash=NULL; $timer=0; $openpgp=1; $openpgp_z = 0; }
+       $hash=NULL; $timer=0; $openpgp=0; $openpgp_z = 0; }
 
 INCOMP kf
 INCOMP Vq
--- mcrypt-2.6.8.orig/src/mcrypt_int.h
+++ mcrypt-2.6.8/src/mcrypt_int.h
@@ -15,3 +15,6 @@ void rol_buf(void * buffer, int buffersi
 void mcrypt_version();
 void mcrypt_license();
 void usage(void);
+int print_hashlist();
+int print_keylist();
+int print_list();
--- mcrypt-2.6.8.orig/src/random.c
+++ mcrypt-2.6.8/src/random.c
@@ -24,8 +24,6 @@
 #include <errors.h>
 #include <random.h>
 
-static char rcsid[] = "$Id: random.c,v 1.2 2007/11/07 17:10:22 nmav Exp $";
-
 extern int real_random_flag; /* mcrypt.c */
 
 #ifdef HAVE_DEV_RANDOM
--- mcrypt-2.6.8.orig/src/rndwin32.c
+++ mcrypt-2.6.8/src/rndwin32.c
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
-static char rcsid[] = "$Id: rndwin32.c,v 1.3 2007/11/07 17:14:58 nmav Exp $";
-
 #include <config.h>
 
 #ifdef WIN32
--- mcrypt-2.6.8.orig/src/xmalloc.c
+++ mcrypt-2.6.8/src/xmalloc.c
@@ -20,8 +20,6 @@
 #include <defines.h>
 #include <extra.h>
 
-static char rcsid[] = "$Id: xmalloc.c,v 1.2 2007/11/07 17:10:23 nmav Exp $";
-
 /* memory allocation */
 void *
  _mcrypt_malloc(size_t size)