GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finished interface of StructuringInfo struct and added implementation of setting it's parameters in our cryptplug signMessage and

Browse Source 
encryptmessage functions (setting of parameters in gpgsmplug.c is still missing)
This commit is contained in:
Karl-Heinz Zimmer 2001-12-24 00:09:24 +00:00
parent 9b1da5342b
commit 95bed553e4
1 changed files with 301 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

405
gpgmeplug/gpgmeplug.c
View File

@ -46,7 +46,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
@ -57,6 +56,66 @@
#define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_OpenPGP #define GPGMEPLUG_PROTOCOL GPGME_PROTOCOL_OpenPGP
#endif #endif
#ifndef GPGMEPLUG_SIGN_MAKE_MIME_OBJECT
#define GPGMEPLUG_SIGN_INCLUDE_CLEARTEXT true
#define GPGMEPLUG_SIGN_MAKE_MIME_OBJECT true
#define GPGMEPLUG_SIGN_MAKE_MULTI_MIME true
#define GPGMEPLUG_SIGN_CTYPE_MAIN "multipart/signed; protocol=application/pgp-signature; micalg=pgp-sha1"
#define GPGMEPLUG_SIGN_CDISP_MAIN ""
#define GPGMEPLUG_SIGN_CTENC_MAIN ""
#define GPGMEPLUG_SIGN_CTYPE_VERSION ""
#define GPGMEPLUG_SIGN_CDISP_VERSION ""
#define GPGMEPLUG_SIGN_CTENC_VERSION ""
#define GPGMEPLUG_SIGN_BTEXT_VERSION ""
#define GPGMEPLUG_SIGN_CTYPE_CODE "application/pgp-signature"
#define GPGMEPLUG_SIGN_CDISP_CODE ""
#define GPGMEPLUG_SIGN_CTENC_CODE ""
#define GPGMEPLUG_SIGN_FLAT_PREFIX ""
#define GPGMEPLUG_SIGN_FLAT_SEPARATOR ""
#define GPGMEPLUG_SIGN_FLAT_POSTFIX ""
#endif
#ifndef GPGMEPLUG_ENC_MAKE_MIME_OBJECT
#define GPGMEPLUG_ENC_INCLUDE_CLEARTEXT false
#define GPGMEPLUG_ENC_MAKE_MIME_OBJECT true
#define GPGMEPLUG_ENC_MAKE_MULTI_MIME true
#define GPGMEPLUG_ENC_CTYPE_MAIN "multipart/encrypted; protocol=application/pgp-encrypted"
#define GPGMEPLUG_ENC_CDISP_MAIN ""
#define GPGMEPLUG_ENC_CTENC_MAIN ""
#define GPGMEPLUG_ENC_CTYPE_VERSION "application/pgp-encrypted"
#define GPGMEPLUG_ENC_CDISP_VERSION "attachment"
#define GPGMEPLUG_ENC_CTENC_VERSION ""
#define GPGMEPLUG_ENC_BTEXT_VERSION "Version: 1"
#define GPGMEPLUG_ENC_CTYPE_CODE "application/octet-stream"
#define GPGMEPLUG_ENC_CDISP_CODE "inline; filename=\"msg.asc\""
#define GPGMEPLUG_ENC_CTENC_CODE ""
#define GPGMEPLUG_ENC_FLAT_PREFIX ""
#define GPGMEPLUG_ENC_FLAT_SEPARATOR ""
#define GPGMEPLUG_ENC_FLAT_POSTFIX ""
#endif
// Note: The following specification will result in
// function encryptAndSignMessage() producing
// _empty_ mails.
// This must be changed as soon as our plugin
// is supporting the encryptAndSignMessage() function.
#ifndef GPGMEPLUG_ENCSIGN_MAKE_MIME_OBJECT
#define GPGMEPLUG_ENCSIGN_INCLUDE_CLEARTEXT false
#define GPGMEPLUG_ENCSIGN_MAKE_MIME_OBJECT false
#define GPGMEPLUG_ENCSIGN_MAKE_MULTI_MIME false
#define GPGMEPLUG_ENCSIGN_CTYPE_MAIN ""
#define GPGMEPLUG_ENCSIGN_CDISP_MAIN ""
#define GPGMEPLUG_ENCSIGN_CTENC_MAIN ""
#define GPGMEPLUG_ENCSIGN_CTYPE_VERSION ""
#define GPGMEPLUG_ENCSIGN_CDISP_VERSION ""
#define GPGMEPLUG_ENCSIGN_CTENC_VERSION ""
#define GPGMEPLUG_ENCSIGN_BTEXT_VERSION ""
#define GPGMEPLUG_ENCSIGN_CTYPE_CODE ""
#define GPGMEPLUG_ENCSIGN_CDISP_CODE ""
#define GPGMEPLUG_ENCSIGN_CTENC_CODE ""
#define GPGMEPLUG_ENCSIGN_FLAT_PREFIX ""
#define GPGMEPLUG_ENCSIGN_FLAT_SEPARATOR ""
#define GPGMEPLUG_ENCSIGN_FLAT_POSTFIX ""
#endif
#include "cryptplug.h" #include "cryptplug.h"
@ -694,9 +753,22 @@ bool certificateValidity( const char* certificate,
int* level ){ return true; } int* level ){ return true; }
void storeNewCharPtr( char** dest, const char* src )
{
int sLen;
if( *dest && src ) {
sLen = strlen( src );
*dest = malloc( sLen + 1 );
strncpy( *dest, src, sLen );
*dest[sLen] = '\0';
}
}
bool signMessage( const char* cleartext, bool signMessage( const char* cleartext,
const char** ciphertext, const char** ciphertext,
const char* certificate ) const char* certificate,
struct StructuringInfo* structuring )
{ {
GpgmeCtx ctx; GpgmeCtx ctx;
GpgmeError err; GpgmeError err;
@ -720,6 +792,8 @@ bool signMessage( const char* cleartext,
init_StructuringInfo( structuring );
if( !ciphertext ) if( !ciphertext )
return false; return false;
@ -777,6 +851,42 @@ bool signMessage( const char* cleartext,
gpgme_data_release( data ); gpgme_data_release( data );
gpgme_release (ctx); gpgme_release (ctx);
if( bOk && structuring ) {
structuring->includeCleartext = GPGMEPLUG_SIGN_INCLUDE_CLEARTEXT;
structuring->makeMimeObject = GPGMEPLUG_SIGN_MAKE_MIME_OBJECT;
if( structuring->makeMimeObject ) {
structuring->makeMultiMime = GPGMEPLUG_SIGN_MAKE_MULTI_MIME;
storeNewCharPtr( &structuring->contentTypeMain,
GPGMEPLUG_SIGN_CTYPE_MAIN );
storeNewCharPtr( &structuring->contentDispMain,
GPGMEPLUG_SIGN_CDISP_MAIN );
storeNewCharPtr( &structuring->contentTEncMain,
GPGMEPLUG_SIGN_CTENC_MAIN );
if( structuring->makeMultiMime ) {
storeNewCharPtr( &structuring->contentTypeVersion,
GPGMEPLUG_SIGN_CTYPE_VERSION );
storeNewCharPtr( &structuring->contentDispVersion,
GPGMEPLUG_SIGN_CDISP_VERSION );
storeNewCharPtr( &structuring->contentTEncVersion,
GPGMEPLUG_SIGN_CTENC_VERSION );
storeNewCharPtr( &structuring->bodyTextVersion,
GPGMEPLUG_SIGN_BTEXT_VERSION );
storeNewCharPtr( &structuring->contentTypeCode,
GPGMEPLUG_SIGN_CTYPE_CODE );
storeNewCharPtr( &structuring->contentDispCode,
GPGMEPLUG_SIGN_CDISP_CODE );
storeNewCharPtr( &structuring->contentTEncCode,
GPGMEPLUG_SIGN_CTENC_CODE );
}
} else {
storeNewCharPtr( &structuring->flatTextPrefix,
GPGMEPLUG_SIGN_FLAT_PREFIX );
storeNewCharPtr( &structuring->flatTextSeparator,
GPGMEPLUG_SIGN_FLAT_SEPARATOR );
storeNewCharPtr( &structuring->flatTextPostfix,
GPGMEPLUG_SIGN_FLAT_POSTFIX );
}
}
return bOk; return bOk;
} }
@ -784,36 +894,36 @@ bool signMessage( const char* cleartext,
static const char* static const char*
sig_status_to_string( GpgmeSigStat status ) sig_status_to_string( GpgmeSigStat status )
{ {
const char *result; const char *result;
switch (status) { switch (status) {
case GPGME_SIG_STAT_NONE: case GPGME_SIG_STAT_NONE:
result = "Oops: Signature not verified"; result = "Oops: Signature not verified";
break; break;
case GPGME_SIG_STAT_NOSIG: case GPGME_SIG_STAT_NOSIG:
result = "No signature found"; result = "No signature found";
break; break;
case GPGME_SIG_STAT_GOOD: case GPGME_SIG_STAT_GOOD:
result = "Good signature"; result = "Good signature";
break; break;
case GPGME_SIG_STAT_BAD: case GPGME_SIG_STAT_BAD:
result = "BAD signature"; result = "BAD signature";
break; break;
case GPGME_SIG_STAT_NOKEY: case GPGME_SIG_STAT_NOKEY:
result = "No public key to verify the signature"; result = "No public key to verify the signature";
break; break;
case GPGME_SIG_STAT_ERROR: case GPGME_SIG_STAT_ERROR:
result = "Error verifying the signature"; result = "Error verifying the signature";
break; break;
case GPGME_SIG_STAT_DIFF: case GPGME_SIG_STAT_DIFF:
result = "Different results for signatures"; result = "Different results for signatures";
break; break;
default: default:
result = "Error: Unknown status"; result = "Error: Unknown status";
break; break;
} }
return result; return result;
} }
@ -821,82 +931,82 @@ bool checkMessageSignature( const char* ciphertext,
const char* signaturetext, const char* signaturetext,
struct SignatureMetaData* sigmeta ) struct SignatureMetaData* sigmeta )
{ {
GpgmeCtx ctx; GpgmeCtx ctx;
GpgmeSigStat status; GpgmeSigStat status;
GpgmeData datapart, sigpart; GpgmeData datapart, sigpart;
GpgmeError err; GpgmeError err;
GpgmeKey key; GpgmeKey key;
time_t created; time_t created;
int sig_idx = 0; int sig_idx = 0;
const char* statusStr; const char* statusStr;
const char* fpr; const char* fpr;
gpgme_new( &ctx ); gpgme_new( &ctx );
gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL); gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL);
gpgme_data_new_from_mem( &datapart, ciphertext, gpgme_data_new_from_mem( &datapart, ciphertext,
1+strlen( ciphertext ), 1 ); 1+strlen( ciphertext ), 1 );
gpgme_data_new_from_mem( &sigpart, signaturetext, gpgme_data_new_from_mem( &sigpart, signaturetext,
1+strlen( signaturetext ), 1 ); 1+strlen( signaturetext ), 1 );
gpgme_op_verify( ctx, sigpart, datapart, &status ); gpgme_op_verify( ctx, sigpart, datapart, &status );
gpgme_data_release( datapart ); gpgme_data_release( datapart );
gpgme_data_release( sigpart ); gpgme_data_release( sigpart );
/* Provide information in the sigmeta struct */ /* Provide information in the sigmeta struct */
/* the status string */ /* the status string */
statusStr = sig_status_to_string( status ); statusStr = sig_status_to_string( status );
sigmeta->status = malloc( strlen( statusStr ) + 1 ); sigmeta->status = malloc( strlen( statusStr ) + 1 );
if( sigmeta->status ) { if( sigmeta->status ) {
strcpy( sigmeta->status, statusStr ); strcpy( sigmeta->status, statusStr );
sigmeta->status[strlen( statusStr )] = '\0'; sigmeta->status[strlen( statusStr )] = '\0';
} else
; // nothing to do, is already 0
// Extended information for any number of signatures.
fpr = gpgme_get_sig_status( ctx, sig_idx, &status, &created );
sigmeta->extended_info = 0;
while( fpr != NULL ) {
struct tm* ctime_val;
const char* sig_status;
void* realloc_return = realloc( sigmeta->extended_info,
sizeof( struct SignatureMetaDataExtendedInfo ) * ( sig_idx + 1 ) );
if( realloc_return ) {
sigmeta->extended_info = realloc_return;
// the creation time
sigmeta->extended_info[sig_idx].creation_time = malloc( sizeof( struct tm ) );
if( sigmeta->extended_info[sig_idx].creation_time ) {
ctime_val = localtime( &created );
memcpy( sigmeta->extended_info[sig_idx].creation_time,
ctime_val, sizeof( struct tm ) );
}
err = gpgme_get_sig_key (ctx, sig_idx, &key);
sig_status = sig_status_to_string( status );
sigmeta->extended_info[sig_idx].status_text = malloc( strlen( sig_status ) + 1 );
if( sigmeta->extended_info[sig_idx].status_text ) {
strcpy( sigmeta->extended_info[sig_idx].status_text,
sig_status );
sigmeta->extended_info[sig_idx].status_text[strlen( sig_status )] = '\0';
}
sigmeta->extended_info[sig_idx].fingerprint = malloc( strlen( fpr ) + 1 );
if( sigmeta->extended_info[sig_idx].fingerprint ) {
strcpy( sigmeta->extended_info[sig_idx].fingerprint, fpr );
sigmeta->extended_info[sig_idx].fingerprint[strlen( fpr )] = '\0';
}
} else } else
; // nothing to do, is already 0 break; // if allocation fails once, it isn't likely to
// succeed the next time either
// Extended information for any number of signatures. fpr = gpgme_get_sig_status (ctx, ++sig_idx, &status, &created);
fpr = gpgme_get_sig_status( ctx, sig_idx, &status, &created ); }
sigmeta->extended_info = 0; sigmeta->extended_info_count = sig_idx;
while( fpr != NULL ) { sigmeta->nota_xml = gpgme_get_notation( ctx );
struct tm* ctime_val; sigmeta->status_code = status;
const char* sig_status;
void* realloc_return = realloc( sigmeta->extended_info, gpgme_release( ctx );
sizeof( struct SignatureMetaDataExtendedInfo ) * ( sig_idx + 1 ) ); return ( status == GPGME_SIG_STAT_GOOD );
if( realloc_return ) {
sigmeta->extended_info = realloc_return;
// the creation time
sigmeta->extended_info[sig_idx].creation_time = malloc( sizeof( struct tm ) );
if( sigmeta->extended_info[sig_idx].creation_time ) {
ctime_val = localtime( &created );
memcpy( sigmeta->extended_info[sig_idx].creation_time,
ctime_val, sizeof( struct tm ) );
}
err = gpgme_get_sig_key (ctx, sig_idx, &key);
sig_status = sig_status_to_string( status );
sigmeta->extended_info[sig_idx].status_text = malloc( strlen( sig_status ) + 1 );
if( sigmeta->extended_info[sig_idx].status_text ) {
strcpy( sigmeta->extended_info[sig_idx].status_text,
sig_status );
sigmeta->extended_info[sig_idx].status_text[strlen( sig_status )] = '\0';
}
sigmeta->extended_info[sig_idx].fingerprint = malloc( strlen( fpr ) + 1 );
if( sigmeta->extended_info[sig_idx].fingerprint ) {
strcpy( sigmeta->extended_info[sig_idx].fingerprint, fpr );
sigmeta->extended_info[sig_idx].fingerprint[strlen( fpr )] = '\0';
}
} else
break; // if allocation fails once, it isn't likely to
// succeed the next time either
fpr = gpgme_get_sig_status (ctx, ++sig_idx, &status, &created);
}
sigmeta->extended_info_count = sig_idx;
sigmeta->nota_xml = gpgme_get_notation( ctx );
sigmeta->status_code = status;
gpgme_release( ctx );
return ( status == GPGME_SIG_STAT_GOOD );
} }
bool storeCertificatesFromMessage( bool storeCertificatesFromMessage(
@ -905,7 +1015,8 @@ bool storeCertificatesFromMessage(
bool encryptMessage( const char* cleartext, bool encryptMessage( const char* cleartext,
const char** ciphertext, const char** ciphertext,
const char* addressee ) const char* addressee,
struct StructuringInfo* structuring )
{ {
GpgmeCtx ctx; GpgmeCtx ctx;
GpgmeError err; GpgmeError err;
@ -915,6 +1026,8 @@ bool encryptMessage( const char* cleartext,
char* rCiph = 0; char* rCiph = 0;
bool bOk = false; bool bOk = false;
init_StructuringInfo( structuring );
gpgme_new (&ctx); gpgme_new (&ctx);
gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL); gpgme_set_protocol (ctx, GPGMEPLUG_PROTOCOL);
@ -930,7 +1043,7 @@ bool encryptMessage( const char* cleartext,
if( GPGMEPLUG_PROTOCOL == GPGME_PROTOCOL_CMS ) if( GPGMEPLUG_PROTOCOL == GPGME_PROTOCOL_CMS )
{ {
gpgme_recipients_add_name_with_validity (rset, gpgme_recipients_add_name_with_validity (rset,
"/CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE", "/CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE",
GPGME_VALIDITY_FULL ); GPGME_VALIDITY_FULL );
fputs( "\nGPGSMPLUG encryptMessage() using test key of Aegypten Project\n", stderr ); fputs( "\nGPGSMPLUG encryptMessage() using test key of Aegypten Project\n", stderr );
@ -973,13 +1086,97 @@ bool encryptMessage( const char* cleartext,
fflush( stderr ); fflush( stderr );
if( bOk && structuring ) {
structuring->includeCleartext = GPGMEPLUG_ENC_INCLUDE_CLEARTEXT;
structuring->makeMimeObject = GPGMEPLUG_ENC_MAKE_MIME_OBJECT;
if( structuring->makeMimeObject ) {
structuring->makeMultiMime = GPGMEPLUG_ENC_MAKE_MULTI_MIME;
storeNewCharPtr( &structuring->contentTypeMain,
GPGMEPLUG_ENC_CTYPE_MAIN );
storeNewCharPtr( &structuring->contentDispMain,
GPGMEPLUG_ENC_CDISP_MAIN );
storeNewCharPtr( &structuring->contentTEncMain,
GPGMEPLUG_ENC_CTENC_MAIN );
if( structuring->makeMultiMime ) {
storeNewCharPtr( &structuring->contentTypeVersion,
GPGMEPLUG_ENC_CTYPE_VERSION );
storeNewCharPtr( &structuring->contentDispVersion,
GPGMEPLUG_ENC_CDISP_VERSION );
storeNewCharPtr( &structuring->contentTEncVersion,
GPGMEPLUG_ENC_CTENC_VERSION );
storeNewCharPtr( &structuring->bodyTextVersion,
GPGMEPLUG_ENC_BTEXT_VERSION );
storeNewCharPtr( &structuring->contentTypeCode,
GPGMEPLUG_ENC_CTYPE_CODE );
storeNewCharPtr( &structuring->contentDispCode,
GPGMEPLUG_ENC_CDISP_CODE );
storeNewCharPtr( &structuring->contentTEncCode,
GPGMEPLUG_ENC_CTENC_CODE );
}
} else {
storeNewCharPtr( &structuring->flatTextPrefix,
GPGMEPLUG_ENC_FLAT_PREFIX );
storeNewCharPtr( &structuring->flatTextSeparator,
GPGMEPLUG_ENC_FLAT_SEPARATOR );
storeNewCharPtr( &structuring->flatTextPostfix,
GPGMEPLUG_ENC_FLAT_POSTFIX );
}
}
return bOk; return bOk;
} }
bool encryptAndSignMessage( const char* cleartext, bool encryptAndSignMessage( const char* cleartext,
const char** ciphertext, const char* certificate, const char** ciphertext,
struct SignatureMetaData* sigmeta ){ return true; } const char* certificate,
struct StructuringInfo* structuring )
{
bool bOk;
init_StructuringInfo( structuring );
bOk = false;
// implementation of this function is still missing
if( bOk && structuring ) {
structuring->includeCleartext = GPGMEPLUG_ENCSIGN_INCLUDE_CLEARTEXT;
structuring->makeMimeObject = GPGMEPLUG_ENCSIGN_MAKE_MIME_OBJECT;
if( structuring->makeMimeObject ) {
structuring->makeMultiMime = GPGMEPLUG_ENCSIGN_MAKE_MULTI_MIME;
storeNewCharPtr( &structuring->contentTypeMain,
GPGMEPLUG_ENCSIGN_CTYPE_MAIN );
storeNewCharPtr( &structuring->contentDispMain,
GPGMEPLUG_ENCSIGN_CDISP_MAIN );
storeNewCharPtr( &structuring->contentTEncMain,
GPGMEPLUG_ENCSIGN_CTENC_MAIN );
if( structuring->makeMultiMime ) {
storeNewCharPtr( &structuring->contentTypeVersion,
GPGMEPLUG_ENCSIGN_CTYPE_VERSION );
storeNewCharPtr( &structuring->contentDispVersion,
GPGMEPLUG_ENCSIGN_CDISP_VERSION );
storeNewCharPtr( &structuring->contentTEncVersion,
GPGMEPLUG_ENCSIGN_CTENC_VERSION );
storeNewCharPtr( &structuring->bodyTextVersion,
GPGMEPLUG_ENCSIGN_BTEXT_VERSION );
storeNewCharPtr( &structuring->contentTypeCode,
GPGMEPLUG_ENCSIGN_CTYPE_CODE );
storeNewCharPtr( &structuring->contentDispCode,
GPGMEPLUG_ENCSIGN_CDISP_CODE );
storeNewCharPtr( &structuring->contentTEncCode,
GPGMEPLUG_ENCSIGN_CTENC_CODE );
}
} else {
storeNewCharPtr( &structuring->flatTextPrefix,
GPGMEPLUG_ENCSIGN_FLAT_PREFIX );
storeNewCharPtr( &structuring->flatTextSeparator,
GPGMEPLUG_ENCSIGN_FLAT_SEPARATOR );
storeNewCharPtr( &structuring->flatTextPostfix,
GPGMEPLUG_ENCSIGN_FLAT_POSTFIX );
}
}
return bOk;
}
bool decryptMessage( const char* ciphertext, bool decryptMessage( const char* ciphertext,
const char** cleartext, const char** cleartext,