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

Adding support for email addresses includes in '<' and '>'.

Browse Source
This commit is contained in:
Karl-Heinz Zimmer 2002-10-31 16:30:45 +00:00
parent f1750eee8a
commit e4a6f97d5e
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gpgmeplug/gpgmeplug.c
View File

@ -457,16 +457,22 @@ bool warnNoCertificate()
bool isEmailInCertificate( const char* email, const char* fingerprint ) bool isEmailInCertificate( const char* email, const char* fingerprint )
{ {
bool bOk = false; bool bOk = false;
if( fingerprint ){ if( searchEmail && fingerprint ){
GpgmeCtx ctx; GpgmeCtx ctx;
GpgmeError err; GpgmeError err;
GpgmeKey rKey; GpgmeKey rKey;
int UID_idx; int UID_idx;
const char* attr_string; const char* attr_string;
int fprLen = strlen( fingerprint ); const char* email = searchEmail;
int emailLen = strlen( email );
int emailCount = 0; int emailCount = 0;
fprintf( stderr, "gpgmeplug isEmailInCertificate looking for fingerprint %s\n", fingerprint ); if (email && *email == '<'){
++email;
emailLen -= 2;
}
fprintf( stderr, "gpgmeplug isEmailInCertificate looking address %s\nin certificate with fingerprint %s\n", email, fingerprint );
gpgme_new( &ctx ); gpgme_new( &ctx );
gpgme_set_protocol( ctx, GPGMEPLUG_PROTOCOL ); gpgme_set_protocol( ctx, GPGMEPLUG_PROTOCOL );
@ -481,25 +487,22 @@ bool isEmailInCertificate( const char* email, const char* fingerprint )
(attr_string = gpgme_key_get_string_attr( (attr_string = gpgme_key_get_string_attr(
rKey, GPGME_ATTR_EMAIL, 0, UID_idx)); rKey, GPGME_ATTR_EMAIL, 0, UID_idx));
++UID_idx ){ ++UID_idx ){
if (attr_string && *attr_string) { if( !attr_string || !*attr_string )
++emailCount;
fprintf( stderr, "gpgmeplug isEmailInCertificate found email: %s\n", attr_string );
if( 0 == strcasecmp(attr_string, email) ){
bOk = true;
break;
}else{
attr_string = gpgme_key_get_string_attr( attr_string = gpgme_key_get_string_attr(
rKey, GPGME_ATTR_USERID, 0, UID_idx ); rKey, GPGME_ATTR_USERID, 0, UID_idx );
if (attr_string && *attr_string == '<'){ if( attr_string ){
if( *attr_string == '<' )
++attr_string; ++attr_string;
if( 0 == strncasecmp(attr_string, email, fprLen) ){ if( *attr_string ){
++emailCount;
fprintf( stderr, "gpgmeplug isEmailInCertificate found email: %s\n", attr_string );
if( 0 == strncasecmp(attr_string, email, emailLen) ){
bOk = true; bOk = true;
break; break;
} }
} }
} }
} }
}
if( !emailCount ) if( !emailCount )
fprintf( stderr, "gpgmeplug isEmailInCertificate found NO EMAIL\n" ); fprintf( stderr, "gpgmeplug isEmailInCertificate found NO EMAIL\n" );
else if( !bOk ) else if( !bOk )
@ -513,7 +516,10 @@ bool isEmailInCertificate( const char* email, const char* fingerprint )
} }
gpgme_release( ctx ); gpgme_release( ctx );
}else{ }else{
if( searchEmail )
fprintf( stderr, "gpgmeplug isEmailInCertificate called with parameter FINGERPRINT being EMPTY\n" ); fprintf( stderr, "gpgmeplug isEmailInCertificate called with parameter FINGERPRINT being EMPTY\n" );
else
fprintf( stderr, "gpgmeplug isEmailInCertificate called with parameter EMAIL being EMPTY\n" );
} }
return bOk; return bOk;
} }