diff options
| author | beck <> | 2014-05-22 21:56:02 +0000 |
|---|---|---|
| committer | beck <> | 2014-05-22 21:56:02 +0000 |
| commit | c2ed0bb5f435dc8317e8f7e2d64d1eb5efa1975a (patch) | |
| tree | ad01380ef0f2b2de9b4b3d5c76c4e3dcd7fdccdd /src/lib/libcrypto/rsa/rsa_lib.c | |
| parent | 31181df3ca3b68e1419bc9a97e4aee92a5f91f73 (diff) | |
| download | openbsd-c2ed0bb5f435dc8317e8f7e2d64d1eb5efa1975a.tar.gz openbsd-c2ed0bb5f435dc8317e8f7e2d64d1eb5efa1975a.tar.bz2 openbsd-c2ed0bb5f435dc8317e8f7e2d64d1eb5efa1975a.zip | |
Convert OPENSSL_malloc stuff back to intrinsics, a few were missed
as new stuff was brought in.
ok miod@
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_lib.c')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c index a618d70f92..1ea5e7bc64 100644 --- a/src/lib/libcrypto/rsa/rsa_lib.c +++ b/src/lib/libcrypto/rsa/rsa_lib.c | |||
| @@ -229,7 +229,7 @@ void RSA_free(RSA *r) | |||
| 229 | if (r->iqmp != NULL) BN_clear_free(r->iqmp); | 229 | if (r->iqmp != NULL) BN_clear_free(r->iqmp); |
| 230 | if (r->blinding != NULL) BN_BLINDING_free(r->blinding); | 230 | if (r->blinding != NULL) BN_BLINDING_free(r->blinding); |
| 231 | if (r->mt_blinding != NULL) BN_BLINDING_free(r->mt_blinding); | 231 | if (r->mt_blinding != NULL) BN_BLINDING_free(r->mt_blinding); |
| 232 | if (r->bignum_data != NULL) OPENSSL_free_locked(r->bignum_data); | 232 | free(r->bignum_data); |
| 233 | free(r); | 233 | free(r); |
| 234 | } | 234 | } |
| 235 | 235 | ||
| @@ -275,7 +275,7 @@ int RSA_memory_lock(RSA *r) | |||
| 275 | j=1; | 275 | j=1; |
| 276 | for (i=0; i<6; i++) | 276 | for (i=0; i<6; i++) |
| 277 | j+= (*t[i])->top; | 277 | j+= (*t[i])->top; |
| 278 | if ((p=OPENSSL_malloc_locked((off+j)*sizeof(BN_ULONG))) == NULL) | 278 | if ((p=reallocarray(NULL, (off+j), sizeof(BN_ULONG))) == NULL) |
| 279 | { | 279 | { |
| 280 | RSAerr(RSA_F_RSA_MEMORY_LOCK,ERR_R_MALLOC_FAILURE); | 280 | RSAerr(RSA_F_RSA_MEMORY_LOCK,ERR_R_MALLOC_FAILURE); |
| 281 | return(0); | 281 | return(0); |
