diff options
author | Ben Laurie <ben@openssl.org> | 2008-11-01 14:37:00 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 2008-11-01 14:37:00 +0000 |
commit | 4d6e1e4f29de455b5e644ea9cae5d5f5a2dbef33 (patch) | |
tree | 9b43a103ede688bfb7b006837387dacb02ec3dc5 /crypto/asn1/a_mbstr.c | |
parent | 122396f2dbeda0f25e9af1bb069a324ec793da57 (diff) |
size_tification.
Diffstat (limited to 'crypto/asn1/a_mbstr.c')
-rw-r--r-- | crypto/asn1/a_mbstr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c index 2d4800a22a..cc4b77478c 100644 --- a/crypto/asn1/a_mbstr.c +++ b/crypto/asn1/a_mbstr.c @@ -80,15 +80,15 @@ static int is_printable(unsigned long value); * The 'ncopy' form checks minimum and maximum size limits too. */ -int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len, - int inform, unsigned long mask) +int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, size_t len, + int inform, unsigned long mask) { return ASN1_mbstring_ncopy(out, in, len, inform, mask, 0, 0); } -int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len, - int inform, unsigned long mask, - long minsize, long maxsize) +int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, size_t len, + int inform, unsigned long mask, size_t minsize, + size_t maxsize) { int str_type; int ret; @@ -145,14 +145,14 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len, if((minsize > 0) && (nchar < minsize)) { ASN1err(ASN1_F_ASN1_MBSTRING_NCOPY, ASN1_R_STRING_TOO_SHORT); - BIO_snprintf(strbuf, sizeof strbuf, "%ld", minsize); + BIO_snprintf(strbuf, sizeof strbuf, "%ld", (long)minsize); ERR_add_error_data(2, "minsize=", strbuf); return -1; } if((maxsize > 0) && (nchar > maxsize)) { ASN1err(ASN1_F_ASN1_MBSTRING_NCOPY, ASN1_R_STRING_TOO_LONG); - BIO_snprintf(strbuf, sizeof strbuf, "%ld", maxsize); + BIO_snprintf(strbuf, sizeof strbuf, "%ld", (long)maxsize); ERR_add_error_data(2, "maxsize=", strbuf); return -1; } |