summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-05-13 06:38:46 +0000
committertb <>2018-05-13 06:38:46 +0000
commit5c39313f78354204100b89647c01a2ee708ed13c (patch)
tree10d6a9a01bbc60886943980d69c6bdab616efc1f
parente50933f7979a361b1d638006d37a0cfd6ad3c6d7 (diff)
downloadopenbsd-5c39313f78354204100b89647c01a2ee708ed13c.tar.gz
openbsd-5c39313f78354204100b89647c01a2ee708ed13c.tar.bz2
openbsd-5c39313f78354204100b89647c01a2ee708ed13c.zip
Add a const qualifier to the argument of EVP_PKEY_get0(3).
tested in a bulk build by sthen ok beck (as part of a larger diff)
-rw-r--r--src/lib/libcrypto/evp/evp.h4
-rw-r--r--src/lib/libcrypto/evp/p_lib.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index ec09deef46..4f2c867196 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp.h,v 1.61 2018/05/13 06:37:14 tb Exp $ */ 1/* $OpenBSD: evp.h,v 1.62 2018/05/13 06:38:46 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 *
@@ -872,7 +872,7 @@ int EVP_PKEY_size(EVP_PKEY *pkey);
872int EVP_PKEY_set_type(EVP_PKEY *pkey, int type); 872int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
873int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len); 873int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
874int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key); 874int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
875void *EVP_PKEY_get0(EVP_PKEY *pkey); 875void *EVP_PKEY_get0(const EVP_PKEY *pkey);
876 876
877#ifndef OPENSSL_NO_RSA 877#ifndef OPENSSL_NO_RSA
878struct rsa_st; 878struct rsa_st;
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index fab1eeb022..9065786d17 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p_lib.c,v 1.22 2018/05/13 06:37:14 tb Exp $ */ 1/* $OpenBSD: p_lib.c,v 1.23 2018/05/13 06:38:46 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 *
@@ -277,7 +277,7 @@ EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
277} 277}
278 278
279void * 279void *
280EVP_PKEY_get0(EVP_PKEY *pkey) 280EVP_PKEY_get0(const EVP_PKEY *pkey)
281{ 281{
282 return pkey->pkey.ptr; 282 return pkey->pkey.ptr;
283} 283}