security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

* keybox-search.c (blob_cmp_mail): Use case-insensitive compare

Browse Source 
because mail addresses are in general case insensitive (well
RFC2822 allows for case sensitive mailbox parts, but this is in
general considired a Bad Thing). Add additional substr parameter
to allow for substring matches within the mail address.  Change
all callers to pass this along.
(blob_cmp_name): Likewise but do the case-insensitive search only
in sub string mode.
(keybox_search): Implement MAILSUB and SUBSTR mode.

* stringhelp.c (ascii_memcasemem): New.
This commit is contained in:
Werner Koch 2002-02-25 18:18:18 +00:00
parent 488243f56e
commit 2a2d713359
2 changed files with 65 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kbx/ChangeLog
View File

@ -1,3 +1,15 @@
2002-02-25 Werner Koch <wk@gnupg.org>
* keybox-search.c (blob_cmp_mail): Use case-insensitive compare
because mail addresses are in general case insensitive (well
RFC2822 allows for case sensitive mailbox parts, but this is in
general considired a Bad Thing). Add additional substr parameter
to allow for substring matches within the mail address. Change
all callers to pass this along.
(blob_cmp_name): Likewise but do the case-insensitive search only
in sub string mode.
(keybox_search): Implement MAILSUB and SUBSTR mode.
2002-01-21 Werner Koch <wk@gnupg.org> 2002-01-21 Werner Koch <wk@gnupg.org>
* keybox-search.c (keybox_search): Allow KEYDB_SEARCH_MODE_FPR20. * keybox-search.c (keybox_search): Allow KEYDB_SEARCH_MODE_FPR20.

63
kbx/keybox-search.c
View File

@ -24,6 +24,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "../jnlib/stringhelp.h" /* ascii_xxxx() */
#include "keybox-defs.h" #include "keybox-defs.h"
#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \ #define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \
@ -138,7 +139,8 @@ blob_cmp_fpr (KEYBOXBLOB blob, const unsigned char *fpr)
static int static int
blob_cmp_name (KEYBOXBLOB blob, int idx, const char *name, size_t namelen) blob_cmp_name (KEYBOXBLOB blob, int idx,
const char *name, size_t namelen, int substr)
{ {
const unsigned char *buffer; const unsigned char *buffer;
size_t length; size_t length;
@ -190,9 +192,17 @@ blob_cmp_name (KEYBOXBLOB blob, int idx, const char *name, size_t namelen)
if (len < 2) if (len < 2)
continue; /* empty name or 0 not stored */ continue; /* empty name or 0 not stored */
len--; len--;
if (substr)
{
if (ascii_memcasemem (buffer+off, len, name, namelen))
return 1; /* found */
}
else
{
if (len == namelen && !memcmp (buffer+off, name, len)) if (len == namelen && !memcmp (buffer+off, name, len))
return 1; /* found */ return 1; /* found */
} }
}
return 0; /* not found */ return 0; /* not found */
} }
else else
@ -207,14 +217,22 @@ blob_cmp_name (KEYBOXBLOB blob, int idx, const char *name, size_t namelen)
if (len < 1) if (len < 1)
return 0; /* empty name */ return 0; /* empty name */
if (substr)
{
return !!ascii_memcasemem (buffer+off, len, name, namelen);
}
else
{
return len == namelen && !memcmp (buffer+off, name, len); return len == namelen && !memcmp (buffer+off, name, len);
} }
} }
}
/* compare all email addresses of the subject */ /* compare all email addresses of the subject. With SUBSTR given as
True a substring search is done in the mail address */
static int static int
blob_cmp_mail (KEYBOXBLOB blob, const char *name, size_t namelen) blob_cmp_mail (KEYBOXBLOB blob, const char *name, size_t namelen, int substr)
{ {
const unsigned char *buffer; const unsigned char *buffer;
size_t length; size_t length;
@ -268,11 +286,19 @@ blob_cmp_mail (KEYBOXBLOB blob, const char *name, size_t namelen)
continue; /* empty name or trailing 0 not stored */ continue; /* empty name or trailing 0 not stored */
len--; /* one back */ len--; /* one back */
if ( len < 3 || buffer[off+len] != '>') if ( len < 3 || buffer[off+len] != '>')
continue; /* not a prober email address */ continue; /* not a proper email address */
len--; len--;
if (len == namelen && !memcmp (buffer+off+1, name, len)) if (substr)
{
if (ascii_memcasemem (buffer+off+1, len, name, namelen))
return 1; /* found */ return 1; /* found */
} }
else
{
if (len == namelen && !ascii_memcasecmp (buffer+off+1, name, len))
return 1; /* found */
}
}
return 0; /* not found */ return 0; /* not found */
} }
@ -314,7 +340,7 @@ has_issuer (KEYBOXBLOB blob, const char *name)
return 0; return 0;
namelen = strlen (name); namelen = strlen (name);
return blob_cmp_name (blob, 0 /* issuer */, name, namelen); return blob_cmp_name (blob, 0 /* issuer */, name, namelen, 0);
} }
static int static int
@ -332,7 +358,7 @@ has_issuer_sn (KEYBOXBLOB blob, const char *name,
namelen = strlen (name); namelen = strlen (name);
return (blob_cmp_sn (blob, sn, snlen) return (blob_cmp_sn (blob, sn, snlen)
&& blob_cmp_name (blob, 0 /* issuer */, name, namelen)); && blob_cmp_name (blob, 0 /* issuer */, name, namelen, 0));
} }
static int static int
@ -356,11 +382,11 @@ has_subject (KEYBOXBLOB blob, const char *name)
return 0; return 0;
namelen = strlen (name); namelen = strlen (name);
return blob_cmp_name (blob, 1 /* subject */, name, namelen); return blob_cmp_name (blob, 1 /* subject */, name, namelen, 0);
} }
static int static int
has_subject_or_alt (KEYBOXBLOB blob, const char *name) has_subject_or_alt (KEYBOXBLOB blob, const char *name, int substr)
{ {
size_t namelen; size_t namelen;
@ -370,12 +396,13 @@ has_subject_or_alt (KEYBOXBLOB blob, const char *name)
return 0; return 0;
namelen = strlen (name); namelen = strlen (name);
return blob_cmp_name (blob, -1 /* all subject names*/, name, namelen); return blob_cmp_name (blob, -1 /* all subject names*/, name,
namelen, substr);
} }
static int static int
has_mail (KEYBOXBLOB blob, const char *name) has_mail (KEYBOXBLOB blob, const char *name, int substr)
{ {
size_t namelen; size_t namelen;
@ -387,7 +414,7 @@ has_mail (KEYBOXBLOB blob, const char *name)
namelen = strlen (name); namelen = strlen (name);
if (namelen && name[namelen-1] == '>') if (namelen && name[namelen-1] == '>')
namelen--; namelen--;
return blob_cmp_mail (blob, name, namelen); return blob_cmp_mail (blob, name, namelen, substr);
} }
@ -564,15 +591,21 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc)
never_reached (); never_reached ();
break; break;
case KEYDB_SEARCH_MODE_EXACT: case KEYDB_SEARCH_MODE_EXACT:
if (has_subject_or_alt (blob, desc[n].u.name)) if (has_subject_or_alt (blob, desc[n].u.name, 0))
goto found; goto found;
break; break;
case KEYDB_SEARCH_MODE_MAIL: case KEYDB_SEARCH_MODE_MAIL:
if (has_mail (blob, desc[n].u.name)) if (has_mail (blob, desc[n].u.name, 0))
goto found;
break;
case KEYDB_SEARCH_MODE_MAILSUB:
if (has_mail (blob, desc[n].u.name, 1))
goto found; goto found;
break; break;
case KEYDB_SEARCH_MODE_SUBSTR: case KEYDB_SEARCH_MODE_SUBSTR:
case KEYDB_SEARCH_MODE_MAILSUB: if (has_subject_or_alt (blob, desc[n].u.name, 1))
goto found;
break;
case KEYDB_SEARCH_MODE_MAILEND: case KEYDB_SEARCH_MODE_MAILEND:
case KEYDB_SEARCH_MODE_WORDS: case KEYDB_SEARCH_MODE_WORDS:
never_reached (); /* not yet implemented */ never_reached (); /* not yet implemented */