diff options
Diffstat (limited to 'smime')
| -rw-r--r-- | smime/ChangeLog | 7 | ||||
| -rw-r--r-- | smime/lib/e-asn1-object.c | 4 | ||||
| -rw-r--r-- | smime/lib/e-pkcs12.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index 3ebf0d040b..918785077e 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,10 @@ +2006-10-01 Kjartan Maraas <kmaraas@gnome.org> + + * lib/e-asn1-object.c: (build_from_der): Initialize a pointer + to NULL and cast away a warning. bug #332101. + * lib/e-pkcs12.c: (prompt_for_password), (nickname_collision): + Fix some signed/unsigned warnings. bug #332101. + 2006-08-21 Andre Klapper <a9016009@gmx.de> * smime-ui.glade: diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index 3fe957f3ba..49002d1cfc 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -229,7 +229,7 @@ build_from_der (EASN1Object *parent, char *data, char *end) PRInt32 len; PRUint32 type; unsigned char code, tagnum; - EASN1Object *asn1object; + EASN1Object *asn1object = NULL; if (data >= end) return TRUE; @@ -254,7 +254,7 @@ build_from_der (EASN1Object *parent, char *data, char *end) return FALSE; } data++; - len = get_der_item_length (data, end, &bytesUsed, &indefinite); + len = get_der_item_length ((unsigned char *)data, (unsigned char *)end, &bytesUsed, &indefinite); data += bytesUsed; if ((len < 0) || ((data+len) > end)) return FALSE; diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 6830b69df3..be5d16138a 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -226,7 +226,7 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd) if (passwd) { size_t len = strlen (passwd); const char *inptr = passwd; - char *outptr; + unsigned char *outptr; gunichar2 c; SECITEM_AllocItem(NULL, pwd, sizeof (gunichar2) * (len + 1)); @@ -414,7 +414,7 @@ nickname_collision(SECItem *oldNick, PRBool *cancel, void *wincx) new_nick = PR_Malloc (sizeof (SECItem)); new_nick->type = siAsciiString; - new_nick->data = nickname; + new_nick->data = (unsigned char *)nickname; new_nick->len = strlen((char*)new_nick->data); return new_nick; } |