summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/rsa
diff options
context:
space:
mode:
authortedu <>2014-07-10 11:25:13 +0000
committertedu <>2014-07-10 11:25:13 +0000
commit9d3143ff6ad17d4edec6f49bea7bcdf7794f64a5 (patch)
tree7e6c9ca704304f6f99e87e8dac39a6d87504a1c5 /src/lib/libcrypto/rsa
parent61a4bd4a18867aecea2b5f0da267ba17f1f102ea (diff)
downloadopenbsd-9d3143ff6ad17d4edec6f49bea7bcdf7794f64a5.tar.gz
openbsd-9d3143ff6ad17d4edec6f49bea7bcdf7794f64a5.tar.bz2
openbsd-9d3143ff6ad17d4edec6f49bea7bcdf7794f64a5.zip
delete some casts. ok miod
Diffstat (limited to 'src/lib/libcrypto/rsa')
-rw-r--r--src/lib/libcrypto/rsa/rsa_none.c4
-rw-r--r--src/lib/libcrypto/rsa/rsa_oaep.c4
-rw-r--r--src/lib/libcrypto/rsa/rsa_pk1.c10
-rw-r--r--src/lib/libcrypto/rsa/rsa_ssl.c6
-rw-r--r--src/lib/libcrypto/rsa/rsa_x931.c6
5 files changed, 15 insertions, 15 deletions
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 @@
1/* $OpenBSD: rsa_none.c,v 1.6 2014/07/09 19:51:38 jsing Exp $ */ 1/* $OpenBSD: rsa_none.c,v 1.7 2014/07/10 11:25:13 tedu Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -78,7 +78,7 @@ RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *from,
78 return 0; 78 return 0;
79 } 79 }
80 80
81 memcpy(to, from, (unsigned int)flen); 81 memcpy(to, from, flen);
82 return 1; 82 return 1;
83} 83}
84 84
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 @@
1/* $OpenBSD: rsa_oaep.c,v 1.19 2014/07/09 19:51:38 jsing Exp $ */ 1/* $OpenBSD: rsa_oaep.c,v 1.20 2014/07/10 11:25:13 tedu Exp $ */
2/* Written by Ulf Moeller. This software is distributed on an "AS IS" 2/* Written by Ulf Moeller. This software is distributed on an "AS IS"
3 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ 3 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */
4 4
@@ -60,7 +60,7 @@ RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
60 memset(db + SHA_DIGEST_LENGTH, 0, 60 memset(db + SHA_DIGEST_LENGTH, 0,
61 emlen - flen - 2 * SHA_DIGEST_LENGTH - 1); 61 emlen - flen - 2 * SHA_DIGEST_LENGTH - 1);
62 db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01; 62 db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01;
63 memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen); 63 memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, flen);
64 if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0) 64 if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
65 return 0; 65 return 0;
66 66
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 @@
1/* $OpenBSD: rsa_pk1.c,v 1.10 2014/07/10 07:41:54 jsing Exp $ */ 1/* $OpenBSD: rsa_pk1.c,v 1.11 2014/07/10 11:25:13 tedu Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -85,7 +85,7 @@ RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
85 memset(p, 0xff, j); 85 memset(p, 0xff, j);
86 p += j; 86 p += j;
87 *(p++) = '\0'; 87 *(p++) = '\0';
88 memcpy(p, from, (unsigned int)flen); 88 memcpy(p, from, flen);
89 89
90 return 1; 90 return 1;
91} 91}
@@ -139,7 +139,7 @@ RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
139 RSA_R_DATA_TOO_LARGE); 139 RSA_R_DATA_TOO_LARGE);
140 return -1; 140 return -1;
141 } 141 }
142 memcpy(to, p, (unsigned int)j); 142 memcpy(to, p, j);
143 143
144 return j; 144 return j;
145} 145}
@@ -177,7 +177,7 @@ RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
177 177
178 *(p++) = '\0'; 178 *(p++) = '\0';
179 179
180 memcpy(p, from, (unsigned int)flen); 180 memcpy(p, from, flen);
181 return 1; 181 return 1;
182} 182}
183 183
@@ -219,7 +219,7 @@ RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
219 RSA_R_DATA_TOO_LARGE); 219 RSA_R_DATA_TOO_LARGE);
220 return -1; 220 return -1;
221 } 221 }
222 memcpy(to, p, (unsigned int)j); 222 memcpy(to, p, j);
223 223
224 return j; 224 return j;
225} 225}
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 @@
1/* $OpenBSD: rsa_ssl.c,v 1.10 2014/07/10 07:41:54 jsing Exp $ */ 1/* $OpenBSD: rsa_ssl.c,v 1.11 2014/07/10 11:25:13 tedu Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -97,7 +97,7 @@ RSA_padding_add_SSLv23(unsigned char *to, int tlen, const unsigned char *from,
97 p += 8; 97 p += 8;
98 *(p++) = '\0'; 98 *(p++) = '\0';
99 99
100 memcpy(p, from, (unsigned int)flen); 100 memcpy(p, from, flen);
101 return 1; 101 return 1;
102} 102}
103 103
@@ -146,7 +146,7 @@ RSA_padding_check_SSLv23(unsigned char *to, int tlen, const unsigned char *from,
146 RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_LARGE); 146 RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_LARGE);
147 return -1; 147 return -1;
148 } 148 }
149 memcpy(to, p, (unsigned int)j); 149 memcpy(to, p, j);
150 150
151 return j; 151 return j;
152} 152}
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 @@
1/* $OpenBSD: rsa_x931.c,v 1.5 2014/07/09 19:51:38 jsing Exp $ */ 1/* $OpenBSD: rsa_x931.c,v 1.6 2014/07/10 11:25:13 tedu Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2005. 3 * project 2005.
4 */ 4 */
@@ -95,7 +95,7 @@ RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *from,
95 } 95 }
96 *p++ = 0xBA; 96 *p++ = 0xBA;
97 } 97 }
98 memcpy(p, from, (unsigned int)flen); 98 memcpy(p, from, flen);
99 p += flen; 99 p += flen;
100 *p = 0xCC; 100 *p = 0xCC;
101 return 1; 101 return 1;
@@ -141,7 +141,7 @@ RSA_padding_check_X931(unsigned char *to, int tlen, const unsigned char *from,
141 return -1; 141 return -1;
142 } 142 }
143 143
144 memcpy(to, p, (unsigned int)j); 144 memcpy(to, p, j);
145 145
146 return j; 146 return j;
147} 147}