[git] Scute - branch, master, updated. scute-1.3.0-35-gbff0ac0
by Justus Winter
cvs at cvs.gnupg.org
Tue Dec 22 12:27:03 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PKCS#11 token on top of gpg-agent".
The branch, master has been updated
via bff0ac01526802dff9ec0def6abbcdfbe2b473f8 (commit)
via 280d7d079c32ca055c80b4cdda8f78baf7960d3c (commit)
via aa62a00b3c0d1820fe878a96b46824e36f9f8a56 (commit)
from dc2211179ea7f63434d726eefbc425390c4c6427 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bff0ac01526802dff9ec0def6abbcdfbe2b473f8
Author: Justus Winter <justus at g10code.com>
Date: Mon Dec 21 17:13:03 2015 +0100
Drop stray semicolon.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/src/debug.c b/src/debug.c
index 11c144b..82638c6 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -89,7 +89,7 @@ _scute_debug_init (void)
if (!initialized)
{
char *e;
- const char *s1, *s2;;
+ const char *s1, *s2;
FILE *stream;
e = getenv ("SCUTE_DEBUG");
commit 280d7d079c32ca055c80b4cdda8f78baf7960d3c
Author: Justus Winter <justus at g10code.com>
Date: Mon Dec 21 15:47:15 2015 +0100
Avoid implicit function declarations.
* src/agent.h (scute_agent_get_cert): New prototype.
* src/cert-gpgsm.c: Add missing includes.
* src/debug.c: Likewise.
* src/p11-getslotinfo.c: Likewise.
* tests/t-getattribute.c: Likewise.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/src/agent.h b/src/agent.h
index 23c5b39..6ac479f 100644
--- a/src/agent.h
+++ b/src/agent.h
@@ -33,6 +33,8 @@
#include <gpg-error.h>
#include <stdbool.h>
+#include "cert.h"
+
/* The information structure for a smart card. */
struct agent_card_info_s
@@ -108,4 +110,7 @@ gpg_error_t scute_agent_sign (char *grip, unsigned char *data, int len,
/* Determine if FPR is trusted. */
gpg_error_t scute_agent_is_trusted (char *fpr, bool *is_trusted);
+/* Try to get certificate for key numer NO. */
+gpg_error_t scute_agent_get_cert (int no, struct cert *cert);
+
#endif /* AGENT_H */
diff --git a/src/cert-gpgsm.c b/src/cert-gpgsm.c
index 0254756..c982b75 100644
--- a/src/cert-gpgsm.c
+++ b/src/cert-gpgsm.c
@@ -40,6 +40,7 @@
#include <gpg-error.h>
#include <assuan.h>
+#include "agent.h"
#include "cert.h"
#include "support.h"
#include "debug.h"
diff --git a/src/debug.c b/src/debug.c
index 5626c3d..11c144b 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -31,6 +31,7 @@
#include <config.h>
#endif
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/p11-getslotinfo.c b/src/p11-getslotinfo.c
index 1679883..cf0ee4b 100644
--- a/src/p11-getslotinfo.c
+++ b/src/p11-getslotinfo.c
@@ -31,10 +31,12 @@
#include <config.h>
#endif
+#include <stdlib.h>
#include <string.h>
#include "cryptoki.h"
+#include "agent.h"
#include "locking.h"
#include "support.h"
#include "settings.h"
diff --git a/tests/t-getattribute.c b/tests/t-getattribute.c
index 1be9190..136f8b8 100644
--- a/tests/t-getattribute.c
+++ b/tests/t-getattribute.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdbool.h>
+#include <string.h>
#include <ctype.h>
#include "t-support.h"
commit aa62a00b3c0d1820fe878a96b46824e36f9f8a56
Author: Justus Winter <justus at g10code.com>
Date: Mon Dec 21 15:44:31 2015 +0100
Copy the maintainer-mode logic from GnuPG.
* configure.ac: Copy the maintainer-mode logic from GnuPG.
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/configure.ac b/configure.ac
index 86babcc..43f1ebd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,78 @@ AH_VERBATIM([_REENTRANT],
# Checks for programs.
AC_PROG_CC
+#
+# Setup gcc specific options
+#
+AC_MSG_NOTICE([checking for cc features])
+if test "$GCC" = yes; then
+ mycflags=
+ mycflags_save=$CFLAGS
+
+ # Check whether gcc does not emit a diagnositc for unknow -Wno-*
+ # options. This is the case for gcc >= 4.6
+ AC_MSG_CHECKING([if gcc ignores unknown -Wno-* options])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6 )
+#kickerror
+#endif]],[])],[_gcc_silent_wno=yes],[_gcc_silent_wno=no])
+ AC_MSG_RESULT($_gcc_silent_wno)
+
+ # Note that it is okay to use CFLAGS here because these are just
+ # warning options and the user should have a chance of overriding
+ # them.
+ if test "$USE_MAINTAINER_MODE" = "yes"; then
+ mycflags="$mycflags -O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
+ mycflags="$mycflags -Wformat -Wno-format-y2k -Wformat-security"
+ if test x"$_gcc_silent_wno" = xyes ; then
+ _gcc_wopt=yes
+ else
+ AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
+ CFLAGS="-Wno-missing-field-initializers"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+ [_gcc_wopt=yes],[_gcc_wopt=no])
+ AC_MSG_RESULT($_gcc_wopt)
+ fi
+ if test x"$_gcc_wopt" = xyes ; then
+ mycflags="$mycflags -W -Wno-sign-compare"
+ mycflags="$mycflags -Wno-missing-field-initializers"
+ fi
+
+ AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
+ CFLAGS="-Wdeclaration-after-statement"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
+ AC_MSG_RESULT($_gcc_wopt)
+ if test x"$_gcc_wopt" = xyes ; then
+ mycflags="$mycflags -Wdeclaration-after-statement"
+ fi
+ else
+ mycflags="$mycflags -Wall"
+ fi
+
+ if test x"$_gcc_silent_wno" = xyes ; then
+ _gcc_psign=yes
+ else
+ AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
+ CFLAGS="-Wno-pointer-sign"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+ [_gcc_psign=yes],[_gcc_psign=no])
+ AC_MSG_RESULT($_gcc_psign)
+ fi
+ if test x"$_gcc_psign" = xyes ; then
+ mycflags="$mycflags -Wno-pointer-sign"
+ fi
+
+ AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
+ CFLAGS="-Wpointer-arith"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
+ AC_MSG_RESULT($_gcc_psign)
+ if test x"$_gcc_psign" = xyes ; then
+ mycflags="$mycflags -Wpointer-arith"
+ fi
+
+ CFLAGS="$mycflags $mycflags_save"
+fi
+
AC_ARG_ENABLE(optimization,
AC_HELP_STRING([--disable-optimization],
[disable compiler optimization]),
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/agent.h | 5 ++++
src/cert-gpgsm.c | 1 +
src/debug.c | 3 ++-
src/p11-getslotinfo.c | 2 ++
tests/t-getattribute.c | 1 +
6 files changed, 83 insertions(+), 1 deletion(-)
hooks/post-receive
--
PKCS#11 token on top of gpg-agent
http://git.gnupg.org
More information about the Gnupg-commits
mailing list