summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/asn1/asn1.h10
-rw-r--r--src/lib/libcrypto/asn1/asn1_locl.h11
2 files changed, 11 insertions, 10 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 6782549886..ff42e45676 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.69 2022/08/29 06:48:58 jsing Exp $ */ 1/* $OpenBSD: asn1.h,v 1.70 2022/09/11 17:22:52 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 *
@@ -547,8 +547,6 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
547ASN1_OBJECT *ASN1_OBJECT_new(void); 547ASN1_OBJECT *ASN1_OBJECT_new(void);
548void ASN1_OBJECT_free(ASN1_OBJECT *a); 548void ASN1_OBJECT_free(ASN1_OBJECT *a);
549int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp); 549int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp);
550ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
551 long length);
552ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, 550ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
553 long length); 551 long length);
554 552
@@ -577,9 +575,6 @@ void ASN1_BIT_STRING_free(ASN1_BIT_STRING *a);
577ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **in, long len); 575ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, const unsigned char **in, long len);
578int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **out); 576int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **out);
579extern const ASN1_ITEM ASN1_BIT_STRING_it; 577extern const ASN1_ITEM ASN1_BIT_STRING_it;
580int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
581ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
582 const unsigned char **pp, long length);
583int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length); 578int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);
584int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value); 579int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
585int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n); 580int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n);
@@ -599,9 +594,6 @@ void ASN1_INTEGER_free(ASN1_INTEGER *a);
599ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **in, long len); 594ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **in, long len);
600int i2d_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **out); 595int i2d_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **out);
601extern const ASN1_ITEM ASN1_INTEGER_it; 596extern const ASN1_ITEM ASN1_INTEGER_it;
602int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
603ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
604 long length);
605ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp, 597ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
606 long length); 598 long length);
607ASN1_INTEGER * ASN1_INTEGER_dup(const ASN1_INTEGER *x); 599ASN1_INTEGER * ASN1_INTEGER_dup(const ASN1_INTEGER *x);
diff --git a/src/lib/libcrypto/asn1/asn1_locl.h b/src/lib/libcrypto/asn1/asn1_locl.h
index aa3b50bbab..ca0b7d7d6e 100644
--- a/src/lib/libcrypto/asn1/asn1_locl.h
+++ b/src/lib/libcrypto/asn1/asn1_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1_locl.h,v 1.38 2022/09/03 18:59:09 jsing Exp $ */ 1/* $OpenBSD: asn1_locl.h,v 1.39 2022/09/11 17:22:52 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 2006. 3 * project 2006.
4 */ 4 */
@@ -225,4 +225,13 @@ ASN1_OBJECT *t2i_ASN1_OBJECT_internal(const char *oid);
225 225
226int asn1_time_parse_cbs(const CBS *cbs, int is_gentime, struct tm *out_tm); 226int asn1_time_parse_cbs(const CBS *cbs, int is_gentime, struct tm *out_tm);
227 227
228ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
229 long length);
230int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
231ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
232 const unsigned char **pp, long length);
233int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
234ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
235 long length);
236
228__END_HIDDEN_DECLS 237__END_HIDDEN_DECLS