DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Reverted last libfko change. Added set verify_sig flag when remote_ids are specified.

Browse Source 
git-svn-id: file:///home/mbr/svn/fwknop/trunk@256 510a4753-2344-4c79-9c09-4d669213fbeb
This commit is contained in:
Damien Stuart
2010-07-11 13:55:44 +00:00
parent 647fc3e64d
commit 3c5c8f1da7
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/fko_encryption.c
+6 -12
View File
@@ -764,10 +764,9 @@ fko_get_gpg_signature_fpr(fko_ctx_t ctx, char **fpr)
return(FKO_ERROR_WRONG_ENCRYPTION_TYPE);
/* Make sure we are supposed to verify signatures.
* --DSS don't think we need to do this
*/
if(ctx->verify_gpg_sigs == 0)
return(FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED);
*/
/* Make sure we have a signature to work with.
*/
@@ -797,10 +796,9 @@ fko_get_gpg_signature_id(fko_ctx_t ctx, char **id)
return(FKO_ERROR_WRONG_ENCRYPTION_TYPE);
/* Make sure we are supposed to verify signatures.
* --DSS don't think we need to do this
*/
if(ctx->verify_gpg_sigs == 0)
return(FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED);
*/
/* Make sure we have a signature to work with.
*/
@@ -830,10 +828,9 @@ fko_get_gpg_signature_summary(fko_ctx_t ctx, int *sigsum)
return(FKO_ERROR_WRONG_ENCRYPTION_TYPE);
/* Make sure we are supposed to verify signatures.
* --DSS don't think we need to do this
*/
if(ctx->verify_gpg_sigs == 0)
return(FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED);
*/
/* Make sure we have a signature to work with.
*/
@@ -863,10 +860,9 @@ fko_get_gpg_signature_status(fko_ctx_t ctx, int *sigstat)
return(FKO_ERROR_WRONG_ENCRYPTION_TYPE);
/* Make sure we are supposed to verify signatures.
* --DSS don't think we need to do this
*/
if(ctx->verify_gpg_sigs == 0)
return(FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED);
*/
/* Make sure we have a signature to work with.
*/
@@ -898,10 +894,9 @@ fko_gpg_signature_id_match(fko_ctx_t ctx, const char *id, unsigned char *result)
return(FKO_ERROR_WRONG_ENCRYPTION_TYPE);
/* Make sure we are supposed to verify signatures.
* --DSS don't think we need to do this
*/
if(ctx->verify_gpg_sigs == 0)
return(FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED);
*/
/* Make sure we have a signature to work with.
*/
@@ -933,10 +928,9 @@ fko_gpg_signature_fpr_match(fko_ctx_t ctx, const char *id, unsigned char *result
return(FKO_ERROR_WRONG_ENCRYPTION_TYPE);
/* Make sure we are supposed to verify signatures.
* --DSS don't think we need to do this
*/
if(ctx->verify_gpg_sigs == 0)
return(FKO_ERROR_GPGME_SIGNATURE_VERIFY_DISABLED);
*/
/* Make sure we have a signature to work with.
*/
server/incoming_spa.c
+4
View File
@@ -313,6 +313,10 @@ incoming_spa(fko_srv_options_t *opts)
*/
if(enc_type == FKO_ENCRYPTION_GPG && acc->gpg_remote_id != NULL)
{
/* Set sig verify flag accordingly (just in case)
*/
fko_set_gpg_signature_verify(ctx, 1);
res = fko_get_gpg_signature_id(ctx, &gpg_id);
if(res != FKO_SUCCESS)
{