mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-21 20:38:45 +00:00
Upgrade to 1.4.1.
PR: ports/80157 Submitted by: Vasil Dimov <vd@datamax.bg> Kindly knocked by: dougb
This commit is contained in:
Jun Kuriyama
parent
dfcee1cffb
commit
2b8b1ad066
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=134036
@ -6,8 +6,8 @@
|
||||
#
|
||||
|
||||
PORTNAME= gnupg
|
||||
PORTVERSION= 1.4.0
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 1.4.1
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= ${MASTER_SITE_GNUPG}
|
||||
MASTER_SITE_SUBDIR= gnupg
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (gnupg-1.4.0.tar.bz2) = 8c303606aaf73b7756b9fe6f3d8b58c2
|
||||
SIZE (gnupg-1.4.0.tar.bz2) = 2722669
|
||||
MD5 (gnupg-1.4.0.tar.bz2.sig) = bdfb7093cf5d76d1b69e9b577e9d8514
|
||||
SIZE (gnupg-1.4.0.tar.bz2.sig) = 65
|
||||
MD5 (gnupg-1.4.1.tar.bz2) = fdfc5553d0904cd65011e47a42a9532c
|
||||
SIZE (gnupg-1.4.1.tar.bz2) = 2822791
|
||||
MD5 (gnupg-1.4.1.tar.bz2.sig) = 440038771606d59e9cbc153cccdbac55
|
||||
SIZE (gnupg-1.4.1.tar.bz2.sig) = 65
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
Index: include/cipher.h
|
||||
===================================================================
|
||||
RCS file: /cvs/gnupg/gnupg/include/cipher.h,v
|
||||
retrieving revision 1.63
|
||||
diff -u -r1.63 cipher.h
|
||||
--- include/cipher.h 29 Nov 2004 21:14:18 -0000 1.63
|
||||
+++ include/cipher.h 8 Feb 2005 04:10:29 -0000
|
||||
@@ -75,6 +75,7 @@
|
||||
int keylen;
|
||||
int algo_info_printed;
|
||||
int use_mdc;
|
||||
+ int symmetric;
|
||||
byte key[32]; /* this is the largest used keylen (256 bit) */
|
||||
} DEK;
|
||||
|
||||
Index: g10/mainproc.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnupg/gnupg/g10/mainproc.c,v
|
||||
retrieving revision 1.161
|
||||
diff -u -r1.161 mainproc.c
|
||||
--- g10/mainproc.c 21 Oct 2004 19:18:47 -0000 1.161
|
||||
+++ g10/mainproc.c 8 Feb 2005 04:10:30 -0000
|
||||
@@ -330,6 +330,8 @@
|
||||
|
||||
if(c->dek)
|
||||
{
|
||||
+ c->dek->symmetric=1;
|
||||
+
|
||||
/* FIXME: This doesn't work perfectly if a symmetric
|
||||
key comes before a public key in the message - if
|
||||
the user doesn't know the passphrase, then there is
|
||||
Index: g10/encr-data.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnupg/gnupg/g10/encr-data.c,v
|
||||
retrieving revision 1.30
|
||||
diff -u -r1.30 encr-data.c
|
||||
--- g10/encr-data.c 8 Oct 2004 21:54:26 -0000 1.30
|
||||
+++ g10/encr-data.c 8 Feb 2005 04:10:30 -0000
|
||||
@@ -125,7 +125,7 @@
|
||||
cipher_sync( dfx.cipher_hd );
|
||||
p = temp;
|
||||
/* log_hexdump( "prefix", temp, nprefix+2 ); */
|
||||
- if( p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1] ) {
|
||||
+ if( dek->symmetric && (p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1]) ) {
|
||||
rc = G10ERR_BAD_KEY;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
@ -5,7 +5,6 @@ bin/gpgv
|
||||
libexec/gnupg/gpgkeys_finger
|
||||
libexec/gnupg/gpgkeys_hkp
|
||||
libexec/gnupg/gpgkeys_http
|
||||
libexec/gnupg/gpgkeys_mailto
|
||||
@dirrm libexec/gnupg
|
||||
%%DATADIR%%/FAQ
|
||||
%%DATADIR%%/faq.html
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
#
|
||||
|
||||
PORTNAME= gnupg
|
||||
PORTVERSION= 1.4.0
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 1.4.1
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= ${MASTER_SITE_GNUPG}
|
||||
MASTER_SITE_SUBDIR= gnupg
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (gnupg-1.4.0.tar.bz2) = 8c303606aaf73b7756b9fe6f3d8b58c2
|
||||
SIZE (gnupg-1.4.0.tar.bz2) = 2722669
|
||||
MD5 (gnupg-1.4.0.tar.bz2.sig) = bdfb7093cf5d76d1b69e9b577e9d8514
|
||||
SIZE (gnupg-1.4.0.tar.bz2.sig) = 65
|
||||
MD5 (gnupg-1.4.1.tar.bz2) = fdfc5553d0904cd65011e47a42a9532c
|
||||
SIZE (gnupg-1.4.1.tar.bz2) = 2822791
|
||||
MD5 (gnupg-1.4.1.tar.bz2.sig) = 440038771606d59e9cbc153cccdbac55
|
||||
SIZE (gnupg-1.4.1.tar.bz2.sig) = 65
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
Index: include/cipher.h
|
||||
===================================================================
|
||||
RCS file: /cvs/gnupg/gnupg/include/cipher.h,v
|
||||
retrieving revision 1.63
|
||||
diff -u -r1.63 cipher.h
|
||||
--- include/cipher.h 29 Nov 2004 21:14:18 -0000 1.63
|
||||
+++ include/cipher.h 8 Feb 2005 04:10:29 -0000
|
||||
@@ -75,6 +75,7 @@
|
||||
int keylen;
|
||||
int algo_info_printed;
|
||||
int use_mdc;
|
||||
+ int symmetric;
|
||||
byte key[32]; /* this is the largest used keylen (256 bit) */
|
||||
} DEK;
|
||||
|
||||
Index: g10/mainproc.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnupg/gnupg/g10/mainproc.c,v
|
||||
retrieving revision 1.161
|
||||
diff -u -r1.161 mainproc.c
|
||||
--- g10/mainproc.c 21 Oct 2004 19:18:47 -0000 1.161
|
||||
+++ g10/mainproc.c 8 Feb 2005 04:10:30 -0000
|
||||
@@ -330,6 +330,8 @@
|
||||
|
||||
if(c->dek)
|
||||
{
|
||||
+ c->dek->symmetric=1;
|
||||
+
|
||||
/* FIXME: This doesn't work perfectly if a symmetric
|
||||
key comes before a public key in the message - if
|
||||
the user doesn't know the passphrase, then there is
|
||||
Index: g10/encr-data.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnupg/gnupg/g10/encr-data.c,v
|
||||
retrieving revision 1.30
|
||||
diff -u -r1.30 encr-data.c
|
||||
--- g10/encr-data.c 8 Oct 2004 21:54:26 -0000 1.30
|
||||
+++ g10/encr-data.c 8 Feb 2005 04:10:30 -0000
|
||||
@@ -125,7 +125,7 @@
|
||||
cipher_sync( dfx.cipher_hd );
|
||||
p = temp;
|
||||
/* log_hexdump( "prefix", temp, nprefix+2 ); */
|
||||
- if( p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1] ) {
|
||||
+ if( dek->symmetric && (p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1]) ) {
|
||||
rc = G10ERR_BAD_KEY;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
@ -5,7 +5,6 @@ bin/gpgv
|
||||
libexec/gnupg/gpgkeys_finger
|
||||
libexec/gnupg/gpgkeys_hkp
|
||||
libexec/gnupg/gpgkeys_http
|
||||
libexec/gnupg/gpgkeys_mailto
|
||||
@dirrm libexec/gnupg
|
||||
%%DATADIR%%/FAQ
|
||||
%%DATADIR%%/faq.html
|
||||
|
||||
Loading…
Reference in New Issue
Block a user