gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

require nettle, following removal of libcrypt from glibc

Browse source 
based on the fedora patch, thanks!
This commit is contained in:
Paul 2018-05-15 09:59:20 +01:00 committed by Andrej Kacian
parent 1332638639
commit cecaac4cc8
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configure.ac
View file

@ -489,22 +489,8 @@ if test "x$enable_gnutls" != "xno"; then
AC_SUBST(GNUTLS_CFLAGS)
fi
dnl password encryption
OLDLIBS=$LIBS
LIBS=
case $host_os in
*dragonfly*)
AC_SEARCH_LIBS(encrypt, cipher, [], AC_MSG_ERROR(['encrypt'-function not found.]))
;;
freebsd*)
;; # not used
*)
AC_SEARCH_LIBS(encrypt, crypt, [], AC_MSG_ERROR(['encrypt'-function not found.]))
;;
esac
CRYPT_LIBS=$LIBS
AC_SUBST(CRYPT_LIBS)
LIBS=$OLDLIBS
PKG_CHECK_MODULES(NETTLE, nettle)
AC_SUBST(NETTLE_LIBS)
AC_ARG_WITH(passcrypt-key, [ --with-passcrypt-key=KEY Key used to encode passwords (8 byte string)],
with_passcrypt_key="$withval", with_passcrypt_key="passkey0")

1
src/Makefile.am
View file

@ -598,6 +598,7 @@ claws_mail_LDADD = \
$(GTK_LIBS) \
$(LDAP_LIBS) \
$(GNUTLS_LIBS) \
$(NETTLE_LIBS) \
$(COMPFACE_LIBS) \
$(JPILOT_LIBS) \
$(PTHREAD_LIBS) \

15
src/common/passcrypt.c
View file

@ -29,6 +29,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
#include <nettle/des.h>
#if defined (__FreeBSD__)
#include <rpc/des_crypt.h>
@ -82,11 +83,10 @@ static void
crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
unsigned chunksize, int decrypt)
{
struct des_ctx ctx;
unsigned char temp[64];
memcpy(temp, key, 8);
crypt_unpack(temp);
setkey((const char *) temp);
des_set_key(&ctx,(const uint8_t*) key);
memset(temp, 0, sizeof(temp));
memset(crypt_cfb_iv, 0, sizeof(crypt_cfb_iv));
@ -96,7 +96,14 @@ crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
while (len) {
memcpy(temp, crypt_cfb_iv, sizeof(temp));
encrypt((char *) temp, 0);
/* simulate encrypt() via Nettle */
char temp2[8];
memset(temp2,0,sizeof(temp2));
crypt_cfb_xor(temp2,temp,sizeof(temp)/sizeof(temp2));
des_encrypt(&ctx,sizeof(temp2),(uint8_t*)temp2,(uint8_t*)temp2);
memcpy(temp,temp2,sizeof(temp2));
crypt_unpack(temp);
/* */
if (chunksize > len)
chunksize = len;
if (decrypt)