summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509v3/v3_sxnet.c10
-rw-r--r--src/lib/libcrypto/x509v3/x509v3.h11
2 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
index e113d5f7e2..53db28248a 100644
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ b/src/lib/libcrypto/x509v3/v3_sxnet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_sxnet.c,v 1.20 2018/04/25 11:48:21 tb Exp $ */ 1/* $OpenBSD: v3_sxnet.c,v 1.21 2018/05/13 15:03:01 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -253,7 +253,7 @@ sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
253/* Add an id given the zone as an ASCII number */ 253/* Add an id given the zone as an ASCII number */
254 254
255int 255int
256SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen) 256SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userlen)
257{ 257{
258 ASN1_INTEGER *izone = NULL; 258 ASN1_INTEGER *izone = NULL;
259 259
@@ -267,7 +267,8 @@ SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen)
267/* Add an id given the zone as an unsigned long */ 267/* Add an id given the zone as an unsigned long */
268 268
269int 269int
270SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen) 270SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
271 int userlen)
271{ 272{
272 ASN1_INTEGER *izone = NULL; 273 ASN1_INTEGER *izone = NULL;
273 274
@@ -286,7 +287,8 @@ SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen)
286 */ 287 */
287 288
288int 289int
289SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user, int userlen) 290SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
291 int userlen)
290{ 292{
291 SXNET *sx = NULL; 293 SXNET *sx = NULL;
292 SXNETID *id = NULL; 294 SXNETID *id = NULL;
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h
index abf126996a..3efb4ef25d 100644
--- a/src/lib/libcrypto/x509v3/x509v3.h
+++ b/src/lib/libcrypto/x509v3/x509v3.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509v3.h,v 1.23 2018/04/25 11:48:21 tb Exp $ */ 1/* $OpenBSD: x509v3.h,v 1.24 2018/05/13 15:03:01 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -524,9 +524,12 @@ SXNETID *d2i_SXNETID(SXNETID **a, const unsigned char **in, long len);
524int i2d_SXNETID(SXNETID *a, unsigned char **out); 524int i2d_SXNETID(SXNETID *a, unsigned char **out);
525extern const ASN1_ITEM SXNETID_it; 525extern const ASN1_ITEM SXNETID_it;
526 526
527int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen); 527int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user,
528int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen); 528 int userlen);
529int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user, int userlen); 529int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
530 int userlen);
531int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user,
532 int userlen);
530 533
531ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone); 534ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone);
532ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); 535ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);