X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fpkcs7%2Fpk7_mime.c;h=734643be2874f5e013356505c9dba5407c8c9fb4;hp=f346259b922da90f99d7fe293f797c615b4bd259;hb=657e60fa00ddde3618600d6306be913214d30457;hpb=5a9a4b299c0140ccdd5cc61fef701935a5931842 diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c index f346259b92..734643be28 100644 --- a/crypto/pkcs7/pk7_mime.c +++ b/crypto/pkcs7/pk7_mime.c @@ -149,7 +149,7 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags) if((flags & PKCS7_DETACHED) && data) { /* We want multipart/signed */ /* Generate a random boundary */ - RAND_bytes((unsigned char *)bound, 32); + RAND_pseudo_bytes((unsigned char *)bound, 32); for(i = 0; i < 32; i++) { c = bound[i] & 0xf; if(c < 10) c += '0'; @@ -416,7 +416,7 @@ static STACK *mime_parse_hdr(BIO *bio) headers = sk_new(mime_hdr_cmp); while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) { /* If whitespace at line start then continuation line */ - if(mhdr && isspace(linebuf[0])) state = MIME_NAME; + if(mhdr && isspace((unsigned char)linebuf[0])) state = MIME_NAME; else state = MIME_START; ntmp = NULL; /* Go through all characters */ @@ -520,7 +520,7 @@ static char *strip_start(char *name) /* Else null string */ return NULL; } - if(!isspace(c)) return p; + if(!isspace((unsigned char)c)) return p; } return NULL; } @@ -538,7 +538,7 @@ static char *strip_end(char *name) *p = 0; return name; } - if(isspace(c)) *p = 0; + if(isspace((unsigned char)c)) *p = 0; else return name; } return NULL; @@ -597,7 +597,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) tmpval = BUF_strdup(value); if(!tmpval) return 0; } else tmpval = NULL; - /* Paramter values are case sensitive so leave as is */ + /* Parameter values are case sensitive so leave as is */ mparam = (MIME_PARAM *) Malloc(sizeof(MIME_PARAM)); if(!mparam) return 0; mparam->param_name = tmpname; @@ -643,14 +643,14 @@ static void mime_hdr_free(MIME_HEADER *hdr) if(hdr->name) Free(hdr->name); if(hdr->value) Free(hdr->value); if(hdr->params) sk_pop_free(hdr->params, mime_param_free); - Free((char *)hdr); + Free(hdr); } static void mime_param_free(MIME_PARAM *param) { if(param->param_name) Free(param->param_name); if(param->param_value) Free(param->param_value); - Free((char *)param); + Free(param); } /* Check for a multipart boundary. Returns: