diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-03-03 02:01:26 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-03-03 02:01:26 +0000 |
| commit | 06c684912465497b3feff3e2327680b46b552be7 (patch) | |
| tree | 39f4cc5a69ce3dc2f25c8e64c70014b83f968702 /crypto | |
| parent | 726bae3f0fabbe9508f494eed83e96a7039b52e8 (diff) | |
| download | openssl-06c684912465497b3feff3e2327680b46b552be7.zip openssl-06c684912465497b3feff3e2327680b46b552be7.tar.gz openssl-06c684912465497b3feff3e2327680b46b552be7.tar.bz2 | |
Fix the Win32 compile environment and add various changes so it will now compile
under Win32 (9X and NT) again. Note: some signed/unsigned changes recently
checked in were killing the Win32 compile.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bss_log.c | 3 | ||||
| -rw-r--r-- | crypto/evp/bio_ok.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index cb27798..4ec76fa 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -62,6 +62,8 @@ */ +#if !defined(WIN32) || defined(WINNT) + #include <stdio.h> #include <errno.h> @@ -242,3 +244,4 @@ static int xcloselog(BIO* bp) return(1); } +#endif diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c index 8d7ffe2..174ecde 100644 --- a/crypto/evp/bio_ok.c +++ b/crypto/evp/bio_ok.c @@ -547,7 +547,7 @@ static void block_in(BIO* b) { BIO_OK_CTX *ctx; EVP_MD_CTX *md; - unsigned long tl= 0; + long tl= 0; unsigned char tmp[EVP_MAX_MD_SIZE]; ctx=(BIO_OK_CTX *)b->ptr; diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 9d590f5..071ff09 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -715,7 +715,7 @@ PKCS7_SIGNER_INFO *si; if ((sk != NULL) && (sk_num(sk) != 0)) { unsigned char md_dat[EVP_MAX_MD_SIZE]; - unsigned int md_len; + int md_len; ASN1_OCTET_STRING *message_digest; EVP_DigestFinal(&mdc_tmp,md_dat,&md_len); diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 01afa5a..6fcb63b 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -419,6 +419,8 @@ int PKCS7_add_crl(); int PKCS7_content_new(); int PKCS7_dataVerify(); BIO *PKCS7_dataInit(); +int PKCS7_dataFinal(); +BIO *PKCS7_dataDecode(); PKCS7_SIGNER_INFO *PKCS7_add_signature(); X509 *PKCS7_cert_from_signer_info(); STACK *PKCS7_get_signer_info(); |