diff options
Diffstat (limited to 'source/n/gnupg2')
| -rw-r--r-- | source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch | 65 | ||||
| -rwxr-xr-x | source/n/gnupg2/gnupg2.SlackBuild | 4 |
2 files changed, 1 insertions, 68 deletions
diff --git a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch b/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch deleted file mode 100644 index 26c798ee..00000000 --- a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch +++ /dev/null @@ -1,65 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 -NotDashEscaped: You need GnuPG to verify this message - -#! /bin/sh -patch -p0 -f $* < $0 -exit $? - -agent/ -2010-01-26 Werner Koch <wk@g10code.com> - - * protect.c (do_encryption): Encode the s2kcount and do not use a - static value of 96. - ---- agent/protect.c (revision 5231) -+++ agent/protect.c (working copy) -@@ -360,19 +360,25 @@ - - in canoncical format of course. We use asprintf and %n modifier - and dummy values as placeholders. */ -- p = xtryasprintf -- ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)", -- (int)strlen (modestr), modestr, -- &saltpos, -- blklen, &ivpos, blklen, "", -- enclen, &encpos, enclen, ""); -- if (!p) -- { -- gpg_error_t tmperr = out_of_core (); -- xfree (iv); -- xfree (outbuf); -- return tmperr; -- } -+ { -+ char countbuf[35]; -+ -+ snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ()); -+ p = xtryasprintf -+ ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)", -+ (int)strlen (modestr), modestr, -+ &saltpos, -+ (unsigned int)strlen (countbuf), countbuf, -+ blklen, &ivpos, blklen, "", -+ enclen, &encpos, enclen, ""); -+ if (!p) -+ { -+ gpg_error_t tmperr = out_of_core (); -+ xfree (iv); -+ xfree (outbuf); -+ return tmperr; -+ } -+ } - *resultlen = strlen (p); - *result = (unsigned char*)p; - memcpy (p+saltpos, iv+2*blklen, 8); - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.1.0-svn5201 (GNU/Linux) - -iJwEAQECAAYFAktmpLoACgkQU7Yg0BzgxjCj5wQAyZjQbZM77wdcXIgPgeLsG99W -esWR89/5VM34dY5tOG+McCAiA4/0hl6CYUkkK/394wcfUXbvbZYARPjJg5wMoZsG -VufEL+Uz+eLgkejYPVakOWzK00i7MHqDSjttOqHg0d8wSiy3LKk6CN6N19uPqxbI -/1Io5f3gcroLGfEZlN0= -=oP/V ------END PGP SIGNATURE----- diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild index 1faf1666..54cdbb3b 100755 --- a/source/n/gnupg2/gnupg2.SlackBuild +++ b/source/n/gnupg2/gnupg2.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=gnupg2 VERSION=${VERSION:-$(echo gnupg-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -64,8 +64,6 @@ rm -rf gnupg-$VERSION tar xvf $CWD/gnupg-$VERSION.tar.?z* || exit 1 cd gnupg-$VERSION -zcat $CWD/gnupg-2.0.14-encode-s2k.patch.gz | patch -p0 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |