projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Configurations/15-android.conf: fix implicit __ANDROID_API__ handling.
[oweals/openssl.git]
/
crypto
/
async
/
async.c
diff --git
a/crypto/async/async.c
b/crypto/async/async.c
index 965a1954f9bc01ef24f7f8c002e4b276677b0632..1d83e4576f81455ca6b9c3c8456bfce8389d2b49 100644
(file)
--- a/
crypto/async/async.c
+++ b/
crypto/async/async.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2015-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-201
8
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-19,7
+19,7
@@
#include "async_locl.h"
#include <openssl/err.h>
#include "async_locl.h"
#include <openssl/err.h>
-#include
<internal/cryptlib_int.h>
+#include
"internal/cryptlib_int.h"
#include <string.h>
#define ASYNC_JOB_RUNNING 0
#include <string.h>
#define ASYNC_JOB_RUNNING 0
@@
-30,13
+30,14
@@
static CRYPTO_THREAD_LOCAL ctxkey;
static CRYPTO_THREAD_LOCAL poolkey;
static CRYPTO_THREAD_LOCAL ctxkey;
static CRYPTO_THREAD_LOCAL poolkey;
-static void async_free_pool_internal(async_pool *pool);
-
static async_ctx *async_ctx_new(void)
{
static async_ctx *async_ctx_new(void)
{
- async_ctx *nctx = NULL;
+ async_ctx *nctx;
+
+ if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC))
+ return NULL;
- nctx = OPENSSL_malloc(sizeof
(async_
ctx));
+ nctx = OPENSSL_malloc(sizeof
(*n
ctx));
if (nctx == NULL) {
ASYNCerr(ASYNC_F_ASYNC_CTX_NEW, ERR_R_MALLOC_FAILURE);
goto err;
if (nctx == NULL) {
ASYNCerr(ASYNC_F_ASYNC_CTX_NEW, ERR_R_MALLOC_FAILURE);
goto err;
@@
-57,9
+58,6
@@
err:
async_ctx *async_get_ctx(void)
{
async_ctx *async_get_ctx(void)
{
- if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
- return NULL;
-
return (async_ctx *)CRYPTO_THREAD_get_local(&ctxkey);
}
return (async_ctx *)CRYPTO_THREAD_get_local(&ctxkey);
}
@@
-81,7
+79,7
@@
static ASYNC_JOB *async_job_new(void)
{
ASYNC_JOB *job = NULL;
{
ASYNC_JOB *job = NULL;
- job = OPENSSL_zalloc(sizeof
(ASYNC_JOB
));
+ job = OPENSSL_zalloc(sizeof
(*job
));
if (job == NULL) {
ASYNCerr(ASYNC_F_ASYNC_JOB_NEW, ERR_R_MALLOC_FAILURE);
return NULL;
if (job == NULL) {
ASYNCerr(ASYNC_F_ASYNC_JOB_NEW, ERR_R_MALLOC_FAILURE);
return NULL;
@@
-169,16
+167,19
@@
void async_start_func(void)
int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
int (*func)(void *), void *args, size_t size)
{
int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
int (*func)(void *), void *args, size_t size)
{
- async_ctx *ctx = async_get_ctx();
+ async_ctx *ctx;
+
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return ASYNC_ERR;
+
+ ctx = async_get_ctx();
if (ctx == NULL)
ctx = async_ctx_new();
if (ctx == NULL)
ctx = async_ctx_new();
- if (ctx == NULL)
{
+ if (ctx == NULL)
return ASYNC_ERR;
return ASYNC_ERR;
- }
- if (*job)
{
+ if (*job)
ctx->currjob = *job;
ctx->currjob = *job;
- }
for (;;) {
if (ctx->currjob != NULL) {
for (;;) {
if (ctx->currjob != NULL) {
@@
-219,9
+220,8
@@
int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
}
/* Start a new job */
}
/* Start a new job */
- if ((ctx->currjob = async_get_pool_job()) == NULL)
{
+ if ((ctx->currjob = async_get_pool_job()) == NULL)
return ASYNC_NO_JOBS;
return ASYNC_NO_JOBS;
- }
if (args != NULL) {
ctx->currjob->funcargs = OPENSSL_malloc(size);
if (args != NULL) {
ctx->currjob->funcargs = OPENSSL_malloc(size);
@@
-323,20
+323,19
@@
int ASYNC_init_thread(size_t max_size, size_t init_size)
return 0;
}
return 0;
}
- if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
{
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
return 0;
return 0;
- }
- if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC))
{
+
+ if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC))
return 0;
return 0;
- }
- pool = OPENSSL_zalloc(sizeof
*pool
);
+ pool = OPENSSL_zalloc(sizeof
(*pool)
);
if (pool == NULL) {
ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE);
return 0;
}
if (pool == NULL) {
ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE);
return 0;
}
- pool->jobs = sk_ASYNC_JOB_new_
null(
);
+ pool->jobs = sk_ASYNC_JOB_new_
reserve(NULL, init_size
);
if (pool->jobs == NULL) {
ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE);
OPENSSL_free(pool);
if (pool->jobs == NULL) {
ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_MALLOC_FAILURE);
OPENSSL_free(pool);
@@
-358,7
+357,7
@@
int ASYNC_init_thread(size_t max_size, size_t init_size)
break;
}
job->funcargs = NULL;
break;
}
job->funcargs = NULL;
- sk_ASYNC_JOB_push(pool->jobs, job);
+ sk_ASYNC_JOB_push(pool->jobs, job);
/* Cannot fail due to reserve */
curr_size++;
}
pool->curr_size = curr_size;
curr_size++;
}
pool->curr_size = curr_size;
@@
-369,34
+368,43
@@
int ASYNC_init_thread(size_t max_size, size_t init_size)
return 1;
err:
return 1;
err:
- async_free_pool_internal(pool);
+ async_empty_pool(pool);
+ sk_ASYNC_JOB_free(pool->jobs);
+ OPENSSL_free(pool);
return 0;
}
return 0;
}
-
static void async_free_pool_internal(async_pool *pool
)
+
void async_delete_thread_state(void
)
{
{
- if (pool == NULL)
- return;
+ async_pool *pool = (async_pool *)CRYPTO_THREAD_get_local(&poolkey);
- async_empty_pool(pool);
- sk_ASYNC_JOB_free(pool->jobs);
- OPENSSL_free(pool);
- CRYPTO_THREAD_set_local(&poolkey, NULL);
+ if (pool != NULL) {
+ async_empty_pool(pool);
+ sk_ASYNC_JOB_free(pool->jobs);
+ OPENSSL_free(pool);
+ CRYPTO_THREAD_set_local(&poolkey, NULL);
+ }
async_local_cleanup();
async_ctx_free();
}
void ASYNC_cleanup_thread(void)
{
async_local_cleanup();
async_ctx_free();
}
void ASYNC_cleanup_thread(void)
{
- async_free_pool_internal((async_pool *)CRYPTO_THREAD_get_local(&poolkey));
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return;
+
+ async_delete_thread_state();
}
ASYNC_JOB *ASYNC_get_current_job(void)
{
async_ctx *ctx;
}
ASYNC_JOB *ASYNC_get_current_job(void)
{
async_ctx *ctx;
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return NULL;
+
ctx = async_get_ctx();
ctx = async_get_ctx();
- if(ctx == NULL)
+ if
(ctx == NULL)
return NULL;
return ctx->currjob;
return NULL;
return ctx->currjob;
@@
-409,7
+417,12
@@
ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job)
void ASYNC_block_pause(void)
{
void ASYNC_block_pause(void)
{
- async_ctx *ctx = async_get_ctx();
+ async_ctx *ctx;
+
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return;
+
+ ctx = async_get_ctx();
if (ctx == NULL || ctx->currjob == NULL) {
/*
* We're not in a job anyway so ignore this
if (ctx == NULL || ctx->currjob == NULL) {
/*
* We're not in a job anyway so ignore this
@@
-421,13
+434,18
@@
void ASYNC_block_pause(void)
void ASYNC_unblock_pause(void)
{
void ASYNC_unblock_pause(void)
{
- async_ctx *ctx = async_get_ctx();
+ async_ctx *ctx;
+
+ if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL))
+ return;
+
+ ctx = async_get_ctx();
if (ctx == NULL || ctx->currjob == NULL) {
/*
* We're not in a job anyway so ignore this
*/
return;
}
if (ctx == NULL || ctx->currjob == NULL) {
/*
* We're not in a job anyway so ignore this
*/
return;
}
- if(ctx->blocked > 0)
+ if
(ctx->blocked > 0)
ctx->blocked--;
}
ctx->blocked--;
}