From e664354751e6274f4e304cea46e120e43dd41ade Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 2 Jun 2018 04:41:12 +0000
Subject: Add const to the argument of the following callback getters:
 BIO_meth_get_callback_ctrl, BIO_meth_get_create, BIO_meth_get_ctrl,
 BIO_meth_get_destroy, BIO_meth_get_gets, BIO_meth_get_puts,
 BIO_meth_get_read, and BIO_meth_get_write.

ok jsing
---
 src/lib/libcrypto/bio/bio.h      | 18 +++++++++---------
 src/lib/libcrypto/bio/bio_meth.c | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/lib/libcrypto')

diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 2847d3729e..82463c6beb 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.44 2018/05/30 00:23:04 tb Exp $ */
+/* $OpenBSD: bio.h,v 1.45 2018/06/02 04:41:12 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -337,22 +337,22 @@ typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg);
 /* BIO_METHOD accessors */
 BIO_METHOD *BIO_meth_new(int type, const char *name);
 void BIO_meth_free(BIO_METHOD *biom);
-int (*BIO_meth_get_write(BIO_METHOD *biom))(BIO *, const char *, int);
+int (*BIO_meth_get_write(const BIO_METHOD *biom))(BIO *, const char *, int);
 int BIO_meth_set_write(BIO_METHOD *biom,
     int (*write)(BIO *, const char *, int));
-int (*BIO_meth_get_read(BIO_METHOD *biom))(BIO *, char *, int);
+int (*BIO_meth_get_read(const BIO_METHOD *biom))(BIO *, char *, int);
 int BIO_meth_set_read(BIO_METHOD *biom, int (*read)(BIO *, char *, int));
-int (*BIO_meth_get_puts(BIO_METHOD *biom))(BIO *, const char *);
+int (*BIO_meth_get_puts(const BIO_METHOD *biom))(BIO *, const char *);
 int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts)(BIO *, const char *));
-int (*BIO_meth_get_gets(BIO_METHOD *biom))(BIO *, char *, int);
+int (*BIO_meth_get_gets(const BIO_METHOD *biom))(BIO *, char *, int);
 int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets)(BIO *, char *, int));
-long (*BIO_meth_get_ctrl(BIO_METHOD *biom))(BIO *, int, long, void *);
+long (*BIO_meth_get_ctrl(const BIO_METHOD *biom))(BIO *, int, long, void *);
 int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl)(BIO *, int, long, void *));
-int (*BIO_meth_get_create(BIO_METHOD *biom))(BIO *);
+int (*BIO_meth_get_create(const BIO_METHOD *biom))(BIO *);
 int BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *));
-int (*BIO_meth_get_destroy(BIO_METHOD *biom))(BIO *);
+int (*BIO_meth_get_destroy(const BIO_METHOD *biom))(BIO *);
 int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *));
-long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom))(BIO *, int, BIO_info_cb *);
+long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int, BIO_info_cb *);
 int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
     long (*callback_ctrl)(BIO *, int, BIO_info_cb *));
 
diff --git a/src/lib/libcrypto/bio/bio_meth.c b/src/lib/libcrypto/bio/bio_meth.c
index c795c3f231..4327c010b1 100644
--- a/src/lib/libcrypto/bio/bio_meth.c
+++ b/src/lib/libcrypto/bio/bio_meth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bio_meth.c,v 1.5 2018/02/20 18:51:35 tb Exp $	*/
+/*	$OpenBSD: bio_meth.c,v 1.6 2018/06/02 04:41:12 tb Exp $	*/
 /*
  * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
  *
@@ -40,7 +40,7 @@ BIO_meth_free(BIO_METHOD *biom)
 }
 
 int
-(*BIO_meth_get_write(BIO_METHOD *biom))(BIO *, const char *, int)
+(*BIO_meth_get_write(const BIO_METHOD *biom))(BIO *, const char *, int)
 {
 	return biom->bwrite;
 }
@@ -53,7 +53,7 @@ BIO_meth_set_write(BIO_METHOD *biom, int (*write)(BIO *, const char *, int))
 }
 
 int
-(*BIO_meth_get_read(BIO_METHOD *biom))(BIO *, char *, int)
+(*BIO_meth_get_read(const BIO_METHOD *biom))(BIO *, char *, int)
 {
 	return biom->bread;
 }
@@ -66,7 +66,7 @@ BIO_meth_set_read(BIO_METHOD *biom, int (*read)(BIO *, char *, int))
 }
 
 int
-(*BIO_meth_get_puts(BIO_METHOD *biom))(BIO *, const char *)
+(*BIO_meth_get_puts(const BIO_METHOD *biom))(BIO *, const char *)
 {
 	return biom->bputs;
 }
@@ -79,7 +79,7 @@ BIO_meth_set_puts(BIO_METHOD *biom, int (*puts)(BIO *, const char *))
 }
 
 int
-(*BIO_meth_get_gets(BIO_METHOD *biom))(BIO *, char *, int)
+(*BIO_meth_get_gets(const BIO_METHOD *biom))(BIO *, char *, int)
 {
 	return biom->bgets;
 }
@@ -92,7 +92,7 @@ BIO_meth_set_gets(BIO_METHOD *biom, int (*gets)(BIO *, char *, int))
 }
 
 long
-(*BIO_meth_get_ctrl(BIO_METHOD *biom))(BIO *, int, long, void *)
+(*BIO_meth_get_ctrl(const BIO_METHOD *biom))(BIO *, int, long, void *)
 {
 	return biom->ctrl;
 }
@@ -105,7 +105,7 @@ BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl)(BIO *, int, long, void *))
 }
 
 int
-(*BIO_meth_get_create(BIO_METHOD *biom))(BIO *)
+(*BIO_meth_get_create(const BIO_METHOD *biom))(BIO *)
 {
 	return biom->create;
 }
@@ -118,7 +118,7 @@ BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *))
 }
 
 int
-(*BIO_meth_get_destroy(BIO_METHOD *biom))(BIO *)
+(*BIO_meth_get_destroy(const BIO_METHOD *biom))(BIO *)
 {
 	return biom->destroy;
 }
@@ -131,7 +131,7 @@ BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *))
 }
 
 long
-(*BIO_meth_get_callback_ctrl(BIO_METHOD *biom))(BIO *, int, BIO_info_cb *)
+(*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int, BIO_info_cb *)
 {
 	return
 	    (long (*)(BIO *, int, BIO_info_cb *))biom->callback_ctrl; /* XXX */
-- 
cgit v1.2.3-55-g6feb