diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-04-17 12:08:22 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-04-17 12:08:22 +0000 |
| commit | c20276e4aef1e716980589c43cf9276abc7ff2b7 (patch) | |
| tree | dc4f04b4ea1176b86ab6229cd4338b334ad6496d /crypto | |
| parent | 9ca7047d7141f58b4a4c9e1cdfc0d49301358095 (diff) | |
Fix (most) WIN32 warnings and errors.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/Makefile | 2 | ||||
| -rw-r--r-- | crypto/asn1/ameth_lib.c | 2 | ||||
| -rw-r--r-- | crypto/dh/dh_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/dsa/dsa_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/evp/Makefile | 2 | ||||
| -rw-r--r-- | crypto/evp/pmeth_fn.c | 2 | ||||
| -rw-r--r-- | crypto/evp/pmeth_gn.c | 2 | ||||
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 2 | ||||
| -rw-r--r-- | crypto/rsa/rsa_ameth.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile index 1240d86754..faaf95b0a9 100644 --- a/crypto/asn1/Makefile +++ b/crypto/asn1/Makefile @@ -47,7 +47,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ SRC= $(LIBSRC) EXHEADER= asn1.h asn1_mac.h asn1t.h -HEADER= $(EXHEADER) +HEADER= $(EXHEADER) asn1_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 4dd0dfa62b..17b3c68fc7 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -167,7 +167,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(const char *str, int len) ameth = EVP_PKEY_asn1_get0(i); if (ameth->pkey_flags & ASN1_PKEY_ALIAS) continue; - if ((strlen(ameth->pem_str) == len) && + if (((int)strlen(ameth->pem_str) == len) && !strncasecmp(ameth->pem_str, str, len)) return ameth; } diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 7a83768e2c..2f2589bc25 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -287,7 +287,7 @@ err: static void update_buflen(const BIGNUM *b, size_t *pbuflen) { - int i; + size_t i; if (!b) return; if (*pbuflen < (i = (size_t)BN_num_bytes(b))) diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 56d2099ba4..eafdc2e5d4 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -400,7 +400,7 @@ static void int_dsa_free(EVP_PKEY *pkey) static void update_buflen(const BIGNUM *b, size_t *pbuflen) { - int i; + size_t i; if (!b) return; if (*pbuflen < (i = (size_t)BN_num_bytes(b))) diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index 71fbc0c47c..5f589f27a9 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -45,7 +45,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \ SRC= $(LIBSRC) EXHEADER= evp.h -HEADER= $(EXHEADER) +HEADER= evp_locl.h $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c index 0b97fb5cc7..dbd639bef2 100644 --- a/crypto/evp/pmeth_fn.c +++ b/crypto/evp/pmeth_fn.c @@ -58,8 +58,8 @@ #include <stdio.h> #include <stdlib.h> -#include <openssl/objects.h> #include "cryptlib.h" +#include <openssl/objects.h> #include <openssl/evp.h> #include "evp_locl.h" diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c index 4972d5e96d..da7d800f53 100644 --- a/crypto/evp/pmeth_gn.c +++ b/crypto/evp/pmeth_gn.c @@ -58,8 +58,8 @@ #include <stdio.h> #include <stdlib.h> -#include <openssl/objects.h> #include "cryptlib.h" +#include <openssl/objects.h> #include <openssl/evp.h> #include "evp_locl.h" diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index d68972c7c4..80a130fbbf 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -58,8 +58,8 @@ #include <stdio.h> #include <stdlib.h> -#include <openssl/objects.h> #include "cryptlib.h" +#include <openssl/objects.h> #include <openssl/evp.h> #include "asn1_locl.h" #include "evp_locl.h" diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index a4658c262a..4acc11db33 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -169,7 +169,7 @@ static void int_rsa_free(EVP_PKEY *pkey) static void update_buflen(const BIGNUM *b, size_t *pbuflen) { - int i; + size_t i; if (!b) return; if (*pbuflen < (i = (size_t)BN_num_bytes(b))) |