From 9421b506453fdfe6759d65eb72db5aba17690e4f Mon Sep 17 00:00:00 2001 From: tedu <> Date: Thu, 10 Jul 2014 11:25:13 +0000 Subject: delete some casts. ok miod --- src/lib/libcrypto/rsa/rsa_none.c | 4 ++-- src/lib/libcrypto/rsa/rsa_oaep.c | 4 ++-- src/lib/libcrypto/rsa/rsa_pk1.c | 10 +++++----- src/lib/libcrypto/rsa/rsa_ssl.c | 6 +++--- src/lib/libcrypto/rsa/rsa_x931.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/lib/libcrypto/rsa') diff --git a/src/lib/libcrypto/rsa/rsa_none.c b/src/lib/libcrypto/rsa/rsa_none.c index 818fd26fa4..da95ecf619 100644 --- a/src/lib/libcrypto/rsa/rsa_none.c +++ b/src/lib/libcrypto/rsa/rsa_none.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_none.c,v 1.6 2014/07/09 19:51:38 jsing Exp $ */ +/* $OpenBSD: rsa_none.c,v 1.7 2014/07/10 11:25:13 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -78,7 +78,7 @@ RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *from, return 0; } - memcpy(to, from, (unsigned int)flen); + memcpy(to, from, flen); return 1; } diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c index 1e862a99e0..38ba76b90a 100644 --- a/src/lib/libcrypto/rsa/rsa_oaep.c +++ b/src/lib/libcrypto/rsa/rsa_oaep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_oaep.c,v 1.19 2014/07/09 19:51:38 jsing Exp $ */ +/* $OpenBSD: rsa_oaep.c,v 1.20 2014/07/10 11:25:13 tedu Exp $ */ /* Written by Ulf Moeller. This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ @@ -60,7 +60,7 @@ RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen, memset(db + SHA_DIGEST_LENGTH, 0, emlen - flen - 2 * SHA_DIGEST_LENGTH - 1); db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01; - memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen); + memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, flen); if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0) return 0; diff --git a/src/lib/libcrypto/rsa/rsa_pk1.c b/src/lib/libcrypto/rsa/rsa_pk1.c index 1d6d688d6b..b4434b455a 100644 --- a/src/lib/libcrypto/rsa/rsa_pk1.c +++ b/src/lib/libcrypto/rsa/rsa_pk1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pk1.c,v 1.10 2014/07/10 07:41:54 jsing Exp $ */ +/* $OpenBSD: rsa_pk1.c,v 1.11 2014/07/10 11:25:13 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -85,7 +85,7 @@ RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen, memset(p, 0xff, j); p += j; *(p++) = '\0'; - memcpy(p, from, (unsigned int)flen); + memcpy(p, from, flen); return 1; } @@ -139,7 +139,7 @@ RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen, RSA_R_DATA_TOO_LARGE); return -1; } - memcpy(to, p, (unsigned int)j); + memcpy(to, p, j); return j; } @@ -177,7 +177,7 @@ RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen, *(p++) = '\0'; - memcpy(p, from, (unsigned int)flen); + memcpy(p, from, flen); return 1; } @@ -219,7 +219,7 @@ RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, RSA_R_DATA_TOO_LARGE); return -1; } - memcpy(to, p, (unsigned int)j); + memcpy(to, p, j); return j; } diff --git a/src/lib/libcrypto/rsa/rsa_ssl.c b/src/lib/libcrypto/rsa/rsa_ssl.c index fb2e228454..6c8a02086c 100644 --- a/src/lib/libcrypto/rsa/rsa_ssl.c +++ b/src/lib/libcrypto/rsa/rsa_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ssl.c,v 1.10 2014/07/10 07:41:54 jsing Exp $ */ +/* $OpenBSD: rsa_ssl.c,v 1.11 2014/07/10 11:25:13 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -97,7 +97,7 @@ RSA_padding_add_SSLv23(unsigned char *to, int tlen, const unsigned char *from, p += 8; *(p++) = '\0'; - memcpy(p, from, (unsigned int)flen); + memcpy(p, from, flen); return 1; } @@ -146,7 +146,7 @@ RSA_padding_check_SSLv23(unsigned char *to, int tlen, const unsigned char *from, RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_LARGE); return -1; } - memcpy(to, p, (unsigned int)j); + memcpy(to, p, j); return j; } diff --git a/src/lib/libcrypto/rsa/rsa_x931.c b/src/lib/libcrypto/rsa/rsa_x931.c index 74c4af91a5..e9f4df341d 100644 --- a/src/lib/libcrypto/rsa/rsa_x931.c +++ b/src/lib/libcrypto/rsa/rsa_x931.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_x931.c,v 1.5 2014/07/09 19:51:38 jsing Exp $ */ +/* $OpenBSD: rsa_x931.c,v 1.6 2014/07/10 11:25:13 tedu Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2005. */ @@ -95,7 +95,7 @@ RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *from, } *p++ = 0xBA; } - memcpy(p, from, (unsigned int)flen); + memcpy(p, from, flen); p += flen; *p = 0xCC; return 1; @@ -141,7 +141,7 @@ RSA_padding_check_X931(unsigned char *to, int tlen, const unsigned char *from, return -1; } - memcpy(to, p, (unsigned int)j); + memcpy(to, p, j); return j; } -- cgit v1.2.3-55-g6feb