generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename start_async_job to ssl_start_async_job

Browse Source 
Make it clear that this function is ssl specific.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell
2015-10-09 16:47:43 +01:00
parent 46a283c01c
commit 7fecbf6f21
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ssl/ssl_lib.c
View File

@@ -969,14 +969,14 @@ long SSL_get_default_timeout(const SSL *s)
return (s->method->get_timeout());
}
static int start_async_job(SSL *s, struct ssl_async_args *args,
static int ssl_start_async_job(SSL *s, struct ssl_async_args *args,
int (*func)(void *)) {
int ret;
switch(ASYNC_start_job(&s->job, &ret, func, args,
sizeof(struct ssl_async_args))) {
case ASYNC_ERR:
s->rwstate = SSL_NOTHING;
SSLerr(SSL_F_START_ASYNC_JOB, SSL_R_FAILED_TO_INIT_ASYNC);
SSLerr(SSL_F_SSL_START_ASYNC_JOB, SSL_R_FAILED_TO_INIT_ASYNC);
return -1;
case ASYNC_PAUSE:
s->rwstate = SSL_ASYNC_PAUSED;
@@ -986,7 +986,7 @@ static int start_async_job(SSL *s, struct ssl_async_args *args,
return ret;
default:
s->rwstate = SSL_NOTHING;
SSLerr(SSL_F_START_ASYNC_JOB, ERR_R_INTERNAL_ERROR);
SSLerr(SSL_F_SSL_START_ASYNC_JOB, ERR_R_INTERNAL_ERROR);
/* Shouldn't happen */
return -1;
}
@@ -1030,7 +1030,7 @@ int SSL_read(SSL *s, void *buf, int num)
args.type = 1;
args.f.func1 = s->method->ssl_read;
return start_async_job(s, &args, ssl_io_intern);
return ssl_start_async_job(s, &args, ssl_io_intern);
} else {
return s->method->ssl_read(s, buf, num);
}
@@ -1055,7 +1055,7 @@ int SSL_peek(SSL *s, void *buf, int num)
args.type = 1;
args.f.func1 = s->method->ssl_peek;
return start_async_job(s, &args, ssl_io_intern);
return ssl_start_async_job(s, &args, ssl_io_intern);
} else {
return s->method->ssl_peek(s, buf, num);
}
@@ -1083,7 +1083,7 @@ int SSL_write(SSL *s, const void *buf, int num)
args.type = 2;
args.f.func2 = s->method->ssl_write;
return start_async_job(s, &args, ssl_io_intern);
return ssl_start_async_job(s, &args, ssl_io_intern);
} else {
return s->method->ssl_write(s, buf, num);
}
@@ -2523,7 +2523,7 @@ int SSL_do_handshake(SSL *s)
args.s = s;
ret = start_async_job(s, &args, ssl_do_handshake_intern);
ret = ssl_start_async_job(s, &args, ssl_do_handshake_intern);
} else {
ret = s->handshake_func(s);
}