From 1d195b2f50d786e8805fd9683f1aa3d058620b4f Mon Sep 17 00:00:00 2001 From: tb <> Date: Tue, 1 May 2018 13:30:24 +0000 Subject: const for BIO_f_ssl(), the last const difference to OpenSSL in our public API in libssl. ok beck, jsing --- src/lib/libssl/bio_ssl.c | 6 +++--- src/lib/libssl/ssl.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index 344ca21786..d68e011c62 100644 --- a/src/lib/libssl/bio_ssl.c +++ b/src/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/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index b68b262969..c3b553fa2f 100644 --- a/src/lib/libssl/ssl.h +++ b/src/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); -- cgit v1.2.3-55-g6feb