DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Added gpg validity check. Tweak to rpm spec file.

Browse Source
This commit is contained in:
Damien Stuart 2012-07-14 10:13:26 -04:00
parent 7e8e48412f
commit 283e213a61
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fwknop.spec
View File

@ -24,9 +24,9 @@ URL: http://www.cipherdyne.org/fwknop/
Source0: fwknop-%{version}.tar.gz Source0: fwknop-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gpg, gpgme-devel, libpcap-devel, gdbm-devel BuildRequires: gpg, gpgme-devel, libpcap-devel, gdbm-devel, iptables
Requires: libfko Requires: libfko, iptables
%package -n libfko %package -n libfko

1
lib/fko_context.h
View File

@ -41,6 +41,7 @@ struct fko_gpg_sig {
struct fko_gpg_sig *next; struct fko_gpg_sig *next;
gpgme_sigsum_t summary; gpgme_sigsum_t summary;
gpgme_error_t status; gpgme_error_t status;
gpgme_validity_t validity;
char *fpr; char *fpr;
}; };

3
lib/gpgme_funcs.c
View File

@ -137,6 +137,7 @@ process_sigs(fko_ctx_t fko_ctx, gpgme_verify_result_t vres)
*/ */
fgs->summary = sig->summary; fgs->summary = sig->summary;
fgs->status = sig->status; fgs->status = sig->status;
fgs->validity = sig->validity;
/* Grab the signature fingerprint. /* Grab the signature fingerprint.
*/ */
@ -168,7 +169,7 @@ process_sigs(fko_ctx_t fko_ctx, gpgme_verify_result_t vres)
*/ */
fgs = fko_ctx->gpg_sigs; fgs = fko_ctx->gpg_sigs;
if(fgs->status != GPG_ERR_NO_ERROR) { if(fgs->status != GPG_ERR_NO_ERROR || fgs->validity < 3) {
fko_ctx->gpg_err = fgs->status; fko_ctx->gpg_err = fgs->status;
return(FKO_ERROR_GPGME_BAD_SIGNATURE); return(FKO_ERROR_GPGME_BAD_SIGNATURE);