From a8eeb155b5323809113e57e62de887b31f9fba7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Fri, 14 Jan 2000 17:28:48 +0000 Subject: [PATCH] Avoid some warnings, and run "make update". --- crypto/err/Makefile.ssl | 13 +++++++------ crypto/err/err_all.c | 1 + crypto/mem_dbg.c | 10 +++++++--- crypto/pkcs7/pk7_mime.c | 6 +++--- crypto/rand/Makefile.ssl | 8 +++++--- crypto/x509/Makefile.ssl | 18 ++++++++++++++++++ util/libeay.num | 5 +++++ 7 files changed, 46 insertions(+), 15 deletions(-) diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl index e0f5128f4..cf54cdd44 100644 --- a/crypto/err/Makefile.ssl +++ b/crypto/err/Makefile.ssl @@ -96,12 +96,13 @@ err_all.o: ../../include/openssl/md2.h ../../include/openssl/md5.h err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h -err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h -err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h -err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h -err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -err_all.o: ../../include/openssl/stack.h ../../include/openssl/x509.h -err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h +err_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h +err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +err_all.o: ../../include/openssl/x509v3.h err_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h err_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index a6f6447a7..10c463b38 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -80,6 +80,7 @@ #include #include #include +#include #include void ERR_load_crypto_strings(void) diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 7f9cc0ec7..657530750 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -592,9 +592,11 @@ static void print_leak(MEM *m, MEM_LEAK *l) amip=m->app_info; ami_cnt=0; - if (amip) - ti=amip->thread; - while(amip && amip->thread == ti) + if (!amip) + return; + ti=amip->thread; + + do { int buf_len; int info_len; @@ -622,6 +624,8 @@ static void print_leak(MEM *m, MEM_LEAK *l) amip = amip->next; } + while(amip && amip->thread == ti); + #ifdef LEVITTE_DEBUG if (amip) { diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c index f346259b9..4282f69d0 100644 --- a/crypto/pkcs7/pk7_mime.c +++ b/crypto/pkcs7/pk7_mime.c @@ -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; diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl index 41190f5f4..7ce3084e0 100644 --- a/crypto/rand/Makefile.ssl +++ b/crypto/rand/Makefile.ssl @@ -79,9 +79,11 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h -md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h -md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +md_rand.o: ../../include/openssl/rand.h ../../include/openssl/sha.h +md_rand.o: ../../include/openssl/stack.h +rand_err.o: ../../include/openssl/err.h ../../include/openssl/rand.h rand_lib.o: ../../include/openssl/rand.h randfile.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h randfile.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl index a569c8091..c5f68a9e1 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile.ssl @@ -123,6 +123,24 @@ by_file.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h by_file.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h by_file.o: ../../include/openssl/stack.h ../../include/openssl/x509.h by_file.o: ../../include/openssl/x509_vfy.h ../cryptlib.h +x509_att.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h +x509_att.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h +x509_att.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h +x509_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h +x509_att.o: ../../include/openssl/des.h ../../include/openssl/dh.h +x509_att.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h +x509_att.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +x509_att.o: ../../include/openssl/evp.h ../../include/openssl/idea.h +x509_att.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h +x509_att.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +x509_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h +x509_att.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h +x509_att.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h +x509_att.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +x509_att.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +x509_att.o: ../../include/openssl/x509v3.h ../cryptlib.h x509_cmp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h x509_cmp.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h x509_cmp.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h diff --git a/util/libeay.num b/util/libeay.num index 818187286..ac6c4d12d 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2173,3 +2173,8 @@ X509_radd_attr 2197 X509_ATTRIBUTE_iget_data 2198 X509_delete_attr 2199 X509_get_attr_by_OBJ 2200 +RAND_add 2201 +BIO_number_written 2202 +BIO_number_read 2203 +X509_STORE_CTX_rget_chain 2204 +ERR_load_RAND_strings 2205