summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2016-12-27 16:46:45 +0000
committerjsing <>2016-12-27 16:46:45 +0000
commitb72186b70e92e0bd62770a5336a295128517b62e (patch)
tree64a26d620dabd7fbc71cda887f7036edaf63d92b /src
parentea7d90cc3b15c2d2076e56fdb931181478d62eea (diff)
downloadopenbsd-b72186b70e92e0bd62770a5336a295128517b62e.tar.gz
openbsd-b72186b70e92e0bd62770a5336a295128517b62e.tar.bz2
openbsd-b72186b70e92e0bd62770a5336a295128517b62e.zip
Use correct version of previous macro expansion.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/asn1.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index b665de903a..ca6d994a70 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.39 2016/12/27 16:23:05 jsing Exp $ */ 1/* $OpenBSD: asn1.h,v 1.40 2016/12/27 16:46:45 jsing 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 *
@@ -745,7 +745,7 @@ typedef struct BIT_STRING_BITNAME_st {
745ASN1_TYPE *ASN1_TYPE_new(void); 745ASN1_TYPE *ASN1_TYPE_new(void);
746void ASN1_TYPE_free(ASN1_TYPE *a); 746void ASN1_TYPE_free(ASN1_TYPE *a);
747ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **a, const unsigned char **in, long len); 747ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **a, const unsigned char **in, long len);
748int i2d_ASN1_TYPE(const ASN1_TYPE *a, unsigned char **out); 748int i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **out);
749extern const ASN1_ITEM ASN1_ANY_it; 749extern const ASN1_ITEM ASN1_ANY_it;
750 750
751int ASN1_TYPE_get(ASN1_TYPE *a); 751int ASN1_TYPE_get(ASN1_TYPE *a);
@@ -879,18 +879,18 @@ extern const ASN1_ITEM ASN1_BMPSTRING_it;
879ASN1_STRING *ASN1_PRINTABLE_new(void); 879ASN1_STRING *ASN1_PRINTABLE_new(void);
880void ASN1_PRINTABLE_free(ASN1_STRING *a); 880void ASN1_PRINTABLE_free(ASN1_STRING *a);
881ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a, const unsigned char **in, long len); 881ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a, const unsigned char **in, long len);
882int i2d_ASN1_PRINTABLE(const ASN1_STRING *a, unsigned char **out); 882int i2d_ASN1_PRINTABLE(ASN1_STRING *a, unsigned char **out);
883extern const ASN1_ITEM ASN1_PRINTABLE_it; 883extern const ASN1_ITEM ASN1_PRINTABLE_it;
884 884
885ASN1_STRING *DIRECTORYSTRING_new(void); 885ASN1_STRING *DIRECTORYSTRING_new(void);
886void DIRECTORYSTRING_free(ASN1_STRING *a); 886void DIRECTORYSTRING_free(ASN1_STRING *a);
887ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, const unsigned char **in, long len); 887ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, const unsigned char **in, long len);
888int i2d_DIRECTORYSTRING(const ASN1_STRING *a, unsigned char **out); 888int i2d_DIRECTORYSTRING(ASN1_STRING *a, unsigned char **out);
889extern const ASN1_ITEM DIRECTORYSTRING_it; 889extern const ASN1_ITEM DIRECTORYSTRING_it;
890ASN1_STRING *DISPLAYTEXT_new(void); 890ASN1_STRING *DISPLAYTEXT_new(void);
891void DISPLAYTEXT_free(ASN1_STRING *a); 891void DISPLAYTEXT_free(ASN1_STRING *a);
892ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, const unsigned char **in, long len); 892ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, const unsigned char **in, long len);
893int i2d_DISPLAYTEXT(const ASN1_STRING *a, unsigned char **out); 893int i2d_DISPLAYTEXT(ASN1_STRING *a, unsigned char **out);
894extern const ASN1_ITEM DISPLAYTEXT_it; 894extern const ASN1_ITEM DISPLAYTEXT_it;
895ASN1_PRINTABLESTRING *ASN1_PRINTABLESTRING_new(void); 895ASN1_PRINTABLESTRING *ASN1_PRINTABLESTRING_new(void);
896void ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a); 896void ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a);