Commit a8eeb155 authored by Bodo Möller's avatar Bodo Möller
Browse files

Avoid some warnings, and run "make update".

parent 2f878669

crypto/err/Makefile.ssl

+7 −6
Original line number Diff line number Diff line
@@ -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

crypto/err/err_all.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
#include <openssl/x509v3.h>

#include <openssl/conf.h>

#include <openssl/pkcs12.h>

#include <openssl/rand.h>

#include <openssl/err.h>



void ERR_load_crypto_strings(void)

crypto/mem_dbg.c

+7 −3
Original line number Diff line number Diff line
@@ -592,9 +592,11 @@ static void print_leak(MEM *m, MEM_LEAK *l) 


	amip=m->app_info;

	ami_cnt=0;

	if (amip)

	if (!amip)

		return;

	ti=amip->thread;

	while(amip && amip->thread == ti)

	

	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)

		{

crypto/pkcs7/pk7_mime.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

crypto/rand/Makefile.ssl

+5 −3
Original line number Diff line number Diff line
@@ -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