diff options
| -rw-r--r-- | crypto/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/bio/bss_bio.c | 4 | ||||
| -rw-r--r-- | crypto/objects/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/ripemd/Makefile.ssl | 5 | ||||
| -rw-r--r-- | crypto/rsa/Makefile.ssl | 7 | ||||
| -rw-r--r-- | crypto/sha/Makefile.ssl | 4 | ||||
| -rwxr-xr-x | util/libeay.num | 2 |
7 files changed, 19 insertions, 7 deletions
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 9dbaaf76ae..a9a3966410 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -126,7 +126,7 @@ lint: done; depend: - if [ ! -e buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist + if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist $(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC) if [ ! -s buildinf.h ]; then rm buildinf.h; fi @for i in $(SDIRS) ;\ diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index be28472d34..ef4b3454d7 100644 --- a/crypto/bio/bss_bio.c +++ b/crypto/bio/bss_bio.c @@ -400,7 +400,7 @@ static size_t bio_nwrite0(BIO *bio, char **buf) static size_t bio_nwrite(BIO *bio, char **buf, size_t num) { - struct bio_bio_st *b=bio->ptr; + struct bio_bio_st *b; size_t space; space = bio_nwrite0(bio, buf); @@ -408,6 +408,8 @@ static size_t bio_nwrite(BIO *bio, char **buf, size_t num) num = space; if (num <= 0) return num; + b = bio->ptr; + assert(b != NULL); b->len += num; assert(b->len <= b->size); diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl index 70d0322ddc..8b15ab0d6c 100644 --- a/crypto/objects/Makefile.ssl +++ b/crypto/objects/Makefile.ssl @@ -93,7 +93,7 @@ obj_dat.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h obj_dat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -obj_dat.o: ../cryptlib.h +obj_dat.o: ../cryptlib.h obj_dat.h obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h obj_err.o: ../../include/openssl/err.h ../../include/openssl/objects.h diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile.ssl index b7cd25f123..890952764d 100644 --- a/crypto/ripemd/Makefile.ssl +++ b/crypto/ripemd/Makefile.ssl @@ -102,6 +102,7 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. +rmd_dgst.o: ../../include/openssl/opensslconf.h rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h -rmd_dgst.o: rmd_locl.h rmdconst.h -rmd_one.o: ../../include/openssl/ripemd.h rmd_locl.h rmdconst.h +rmd_dgst.o: ../md32_common.h rmd_locl.h rmdconst.h +rmd_one.o: ../../include/openssl/ripemd.h diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl index 33890555b5..96333d7cf5 100644 --- a/crypto/rsa/Makefile.ssl +++ b/crypto/rsa/Makefile.ssl @@ -115,6 +115,13 @@ rsa_none.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h rsa_none.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h rsa_none.o: ../cryptlib.h +rsa_null.o: ../../include/openssl/bio.h ../../include/openssl/bn.h +rsa_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h +rsa_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h +rsa_null.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +rsa_null.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h +rsa_null.o: ../cryptlib.h rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h rsa_oaep.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index d01245ce37..0494dca09b 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -104,8 +104,8 @@ clean: sha1_one.o: ../../include/openssl/sha.h sha1dgst.o: ../../include/openssl/opensslconf.h sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h -sha1dgst.o: sha_locl.h +sha1dgst.o: ../md32_common.h sha_locl.h sha_dgst.o: ../../include/openssl/opensslconf.h sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h -sha_dgst.o: sha_locl.h +sha_dgst.o: ../md32_common.h sha_locl.h sha_one.o: ../../include/openssl/sha.h diff --git a/util/libeay.num b/util/libeay.num index d28fa26550..7151850e57 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1876,3 +1876,5 @@ NETSCAPE_SPKI_get_pubkey 1900 NETSCAPE_SPKI_b64_decode 1901 UTF8_putc 1902 UTF8_getc 1903 +RSA_null_method 1904 +ASN1_tag2str 1905 |