l/scute: Upgraded to scute-1.5.0g10a1946.
parent
0f99233a2d
commit
4efbab6674
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/agent.c b/src/agent.c
|
||||
index 75d4933..d6615af 100644
|
||||
--- a/src/agent.c
|
||||
+++ b/src/agent.c
|
||||
@@ -1284,7 +1284,7 @@ scute_agent_get_cert (int no, struct cert *cert)
|
||||
err = assuan_transact (agent_ctx, cmd, get_cert_data_cb, &cert_s,
|
||||
NULL, NULL, NULL, NULL);
|
||||
/* Just to be safe... */
|
||||
- if (!err && cert_s.cert_der_len <= 16)
|
||||
+ if (!err && (cert_s.cert_der_len <= 16 || cert_s.cert_der[0] != 0x30))
|
||||
{
|
||||
DEBUG (DBG_INFO, "bad card certificate rejected");
|
||||
err = gpg_error (GPG_ERR_BAD_CERT);
|
|
@ -29,12 +29,12 @@ NAMESRC=${NAMESRC:-scute}
|
|||
VERSION=${VERSION:-1.5.0}
|
||||
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.bz2}
|
||||
WGET=${WGET:-ftp://ftp.gnupg.org/gcrypt/scute/$ARCHIVE}
|
||||
GITREV=${GITREV:-e4bcc78}
|
||||
GITREV=${GITREV:-10a1946}
|
||||
|
||||
# Build infos
|
||||
NAMEPKG=${NAMEPKG:-scute}
|
||||
VERSIONPKG=${VERSIONPKG:-${VERSION}g$GITREV}
|
||||
BUILD=${BUILD:-2GGD}
|
||||
BUILD=${BUILD:-1GGD}
|
||||
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
|
||||
JOBS=${JOBS:-1}
|
||||
EXT=${EXT:-txz}
|
||||
|
@ -78,6 +78,7 @@ if [ ! -r $ARCHIVE ]; then
|
|||
cd scute
|
||||
git checkout $GITREV
|
||||
patch -p 1 < $CWD/scute-1.5.0-fix-socket-location.diff
|
||||
patch -p 1 < $CWD/scute-1.5.0-reject-bad-cert.diff
|
||||
./autogen.sh --force
|
||||
./configure --enable-maintainer-mode
|
||||
make -j $JOBS
|
||||
|
|
Loading…
Reference in New Issue