summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-11-09 03:42:30 +0000
committertb <>2018-11-09 03:42:30 +0000
commit5227ed064ec75038c5fd654250b783bbf6fbc695 (patch)
treefc6b7d9a6661aa5392a7eb6157582d34c7eb49e6
parentf9cf8173762f5500cc1d282b1069afe2e67358e5 (diff)
downloadopenbsd-5227ed064ec75038c5fd654250b783bbf6fbc695.tar.gz
openbsd-5227ed064ec75038c5fd654250b783bbf6fbc695.tar.bz2
openbsd-5227ed064ec75038c5fd654250b783bbf6fbc695.zip
Add const to the data argument of ASN1_set{,_int}_octetstring().
From Ben L bobsayshilol () live ! co ! uk ok jsing
-rw-r--r--src/lib/libcrypto/asn1/asn1.h6
-rw-r--r--src/lib/libcrypto/asn1/evp_asn1.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 0852ce2ef1..f6c6ba8045 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1.h,v 1.51 2018/11/08 18:13:14 jsing Exp $ */ 1/* $OpenBSD: asn1.h,v 1.52 2018/11/09 03:42:30 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 *
@@ -899,10 +899,10 @@ extern const ASN1_ITEM NETSCAPE_X509_it;
899 899
900int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s); 900int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
901 901
902int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len); 902int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, const unsigned char *data, int len);
903int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, 903int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data,
904 int max_len); 904 int max_len);
905int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, 905int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, const unsigned char *data,
906 int len); 906 int len);
907int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num, 907int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
908 unsigned char *data, int max_len); 908 unsigned char *data, int max_len);
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
index ec63557770..4d616e2b34 100644
--- a/src/lib/libcrypto/asn1/evp_asn1.c
+++ b/src/lib/libcrypto/asn1/evp_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: evp_asn1.c,v 1.21 2018/04/25 11:48:21 tb Exp $ */ 1/* $OpenBSD: evp_asn1.c,v 1.22 2018/11/09 03:42:30 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 *
@@ -64,7 +64,7 @@
64#include <openssl/err.h> 64#include <openssl/err.h>
65 65
66int 66int
67ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len) 67ASN1_TYPE_set_octetstring(ASN1_TYPE *a, const unsigned char *data, int len)
68{ 68{
69 ASN1_STRING *os; 69 ASN1_STRING *os;
70 70
@@ -127,7 +127,7 @@ const ASN1_ITEM ASN1_INT_OCTETSTRING_it = {
127}; 127};
128 128
129int 129int
130ASN1_TYPE_set_int_octetstring(ASN1_TYPE *at, long num, unsigned char *data, 130ASN1_TYPE_set_int_octetstring(ASN1_TYPE *at, long num, const unsigned char *data,
131 int len) 131 int len)
132{ 132{
133 ASN1_int_octetstring *ios; 133 ASN1_int_octetstring *ios;