diff options
| author |   tb <tb@openbsd.org> | 2018-05-01 13:30:24 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-05-01 13:30:24 +0000 |
| commit | daf0add4e0d1721b8036f2e468696c0e73facfa9 (patch) | |
| tree | c5692176c17798ef2e27d2878486cd2ae75a54d3 | |
| parent | const for BIO_{new,set}() and most of the BIO_{f,s}_*() family of (diff) | |
| download | wireguard-openbsd-daf0add4e0d1721b8036f2e468696c0e73facfa9.tar.xz wireguard-openbsd-daf0add4e0d1721b8036f2e468696c0e73facfa9.zip | |
const for BIO_f_ssl(), the last const difference to OpenSSL in our
public API in libssl.
ok beck, jsing
| -rw-r--r-- | lib/libssl/bio_ssl.c | 6 | ||||
| -rw-r--r-- | lib/libssl/ssl.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libssl/bio_ssl.c b/lib/libssl/bio_ssl.c index 344ca21786a..d68e011c620 100644 --- a/lib/libssl/bio_ssl.c +++ b/lib/libssl/bio_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ssl.c,v 1.27 2017/02/07 02:08:38 beck Exp $ */ +/* $OpenBSD: bio_ssl.c,v 1.28 2018/05/01 13:30:24 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -85,7 +85,7 @@ typedef struct bio_ssl_st { time_t last_time; } BIO_SSL; -static BIO_METHOD methods_sslp = { +static const BIO_METHOD methods_sslp = { .type = BIO_TYPE_SSL, .name = "ssl", .bwrite = ssl_write, @@ -97,7 +97,7 @@ static BIO_METHOD methods_sslp = { .callback_ctrl = ssl_callback_ctrl, }; -BIO_METHOD * +const BIO_METHOD * BIO_f_ssl(void) { return (&methods_sslp); diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index b68b262969d..c3b553fa2f6 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.157 2018/04/25 07:25:17 tb Exp $ */ +/* $OpenBSD: ssl.h,v 1.158 2018/05/01 13:30:24 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1221,7 +1221,7 @@ int SSL_set_max_proto_version(SSL *ssl, uint16_t version); #define SSL_set_max_proto_version SSL_set_max_proto_version #endif -BIO_METHOD *BIO_f_ssl(void); +const BIO_METHOD *BIO_f_ssl(void); BIO *BIO_new_ssl(SSL_CTX *ctx, int client); BIO *BIO_new_ssl_connect(SSL_CTX *ctx); BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx); |