summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-05-01 13:30:24 +0000
committertb <>2018-05-01 13:30:24 +0000
commit1d195b2f50d786e8805fd9683f1aa3d058620b4f (patch)
tree136f68e04ca016e2f44df48bd4650f1c5ea9c425
parent82267b005082127062ce8593ce4963d09c361e2e (diff)
downloadopenbsd-1d195b2f50d786e8805fd9683f1aa3d058620b4f.tar.gz
openbsd-1d195b2f50d786e8805fd9683f1aa3d058620b4f.tar.bz2
openbsd-1d195b2f50d786e8805fd9683f1aa3d058620b4f.zip
const for BIO_f_ssl(), the last const difference to OpenSSL in our
public API in libssl. ok beck, jsing
-rw-r--r--src/lib/libssl/bio_ssl.c6
-rw-r--r--src/lib/libssl/ssl.h4
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 @@
1/* $OpenBSD: bio_ssl.c,v 1.27 2017/02/07 02:08:38 beck Exp $ */ 1/* $OpenBSD: bio_ssl.c,v 1.28 2018/05/01 13:30:24 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -85,7 +85,7 @@ typedef struct bio_ssl_st {
85 time_t last_time; 85 time_t last_time;
86} BIO_SSL; 86} BIO_SSL;
87 87
88static BIO_METHOD methods_sslp = { 88static const BIO_METHOD methods_sslp = {
89 .type = BIO_TYPE_SSL, 89 .type = BIO_TYPE_SSL,
90 .name = "ssl", 90 .name = "ssl",
91 .bwrite = ssl_write, 91 .bwrite = ssl_write,
@@ -97,7 +97,7 @@ static BIO_METHOD methods_sslp = {
97 .callback_ctrl = ssl_callback_ctrl, 97 .callback_ctrl = ssl_callback_ctrl,
98}; 98};
99 99
100BIO_METHOD * 100const BIO_METHOD *
101BIO_f_ssl(void) 101BIO_f_ssl(void)
102{ 102{
103 return (&methods_sslp); 103 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 @@
1/* $OpenBSD: ssl.h,v 1.157 2018/04/25 07:25:17 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.158 2018/05/01 13:30:24 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1221,7 +1221,7 @@ int SSL_set_max_proto_version(SSL *ssl, uint16_t version);
1221#define SSL_set_max_proto_version SSL_set_max_proto_version 1221#define SSL_set_max_proto_version SSL_set_max_proto_version
1222#endif 1222#endif
1223 1223
1224BIO_METHOD *BIO_f_ssl(void); 1224const BIO_METHOD *BIO_f_ssl(void);
1225BIO *BIO_new_ssl(SSL_CTX *ctx, int client); 1225BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
1226BIO *BIO_new_ssl_connect(SSL_CTX *ctx); 1226BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
1227BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx); 1227BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);