summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-03-26 10:15:59 +0000
committerMatt Caswell <matt@openssl.org>2015-11-20 23:32:18 +0000
commit826760945de655d2d2d387cac3a3646ced80977e (patch)
tree8d2f6696345b56a1d4197acdc6a7398c9084108b /ssl
parent06754949e4317f5ba7e318a8841b78a7d622053f (diff)
Async clean ups
Removed the function ASYNC_job_is_waiting() as it was redundant. The only time user code has a handle on a job is when one is waiting, so all they need to do is check whether the job is NULL. Also did some cleanups to make sure the job really is NULL after it has been freed! Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 63a1a891f2..31adbe473e 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -925,9 +925,9 @@ int SSL_check_private_key(const SSL *ssl)
int SSL_waiting_for_async(SSL *s)
{
- if(s->job) {
- return ASYNC_job_is_waiting(s->job);
- }
+ if(s->job)
+ return 1;
+
return 0;
}