diff options
| author | jsing <> | 2017-01-12 16:15:58 +0000 |
|---|---|---|
| committer | jsing <> | 2017-01-12 16:15:58 +0000 |
| commit | 58d82b289db469d336d518a0e13669ca30ed96f7 (patch) | |
| tree | 75f39fbb8fffc52cf70dca3dc3a44c82bbf892c1 /src | |
| parent | 42e33623ba81fed79cbc5b41b471a85be3888d68 (diff) | |
| download | openbsd-58d82b289db469d336d518a0e13669ca30ed96f7.tar.gz openbsd-58d82b289db469d336d518a0e13669ca30ed96f7.tar.bz2 openbsd-58d82b289db469d336d518a0e13669ca30ed96f7.zip | |
If tls_set_cbs() fails an error will already be specified, so do not
replace it with a less specific one.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libtls/tls_client.c | 6 | ||||
| -rw-r--r-- | src/lib/libtls/tls_server.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c index 18e1667eed..d22a8a95ce 100644 --- a/src/lib/libtls/tls_client.c +++ b/src/lib/libtls/tls_client.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_client.c,v 1.38 2016/12/26 16:20:58 jsing Exp $ */ | 1 | /* $OpenBSD: tls_client.c,v 1.39 2017/01/12 16:15:58 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -276,10 +276,8 @@ tls_connect_cbs(struct tls *ctx, tls_read_cb read_cb, | |||
| 276 | if (tls_connect_common(ctx, servername) != 0) | 276 | if (tls_connect_common(ctx, servername) != 0) |
| 277 | goto err; | 277 | goto err; |
| 278 | 278 | ||
| 279 | if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) { | 279 | if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) |
| 280 | tls_set_errorx(ctx, "callback registration failure"); | ||
| 281 | goto err; | 280 | goto err; |
| 282 | } | ||
| 283 | 281 | ||
| 284 | rv = 0; | 282 | rv = 0; |
| 285 | 283 | ||
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c index a3883315e7..091dd7a153 100644 --- a/src/lib/libtls/tls_server.c +++ b/src/lib/libtls/tls_server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_server.c,v 1.31 2016/11/06 16:55:16 beck Exp $ */ | 1 | /* $OpenBSD: tls_server.c,v 1.32 2017/01/12 16:15:58 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -357,10 +357,8 @@ tls_accept_cbs(struct tls *ctx, struct tls **cctx, | |||
| 357 | if ((conn_ctx = tls_accept_common(ctx)) == NULL) | 357 | if ((conn_ctx = tls_accept_common(ctx)) == NULL) |
| 358 | goto err; | 358 | goto err; |
| 359 | 359 | ||
| 360 | if (tls_set_cbs(conn_ctx, read_cb, write_cb, cb_arg) != 0) { | 360 | if (tls_set_cbs(conn_ctx, read_cb, write_cb, cb_arg) != 0) |
| 361 | tls_set_errorx(ctx, "callback registration failure"); | ||
| 362 | goto err; | 361 | goto err; |
| 363 | } | ||
| 364 | 362 | ||
| 365 | *cctx = conn_ctx; | 363 | *cctx = conn_ctx; |
| 366 | 364 | ||