diff options
author | jsing <> | 2016-12-27 16:46:45 +0000 |
---|---|---|
committer | jsing <> | 2016-12-27 16:46:45 +0000 |
commit | b72186b70e92e0bd62770a5336a295128517b62e (patch) | |
tree | 64a26d620dabd7fbc71cda887f7036edaf63d92b | |
parent | ea7d90cc3b15c2d2076e56fdb931181478d62eea (diff) | |
download | openbsd-b72186b70e92e0bd62770a5336a295128517b62e.tar.gz openbsd-b72186b70e92e0bd62770a5336a295128517b62e.tar.bz2 openbsd-b72186b70e92e0bd62770a5336a295128517b62e.zip |
Use correct version of previous macro expansion.
-rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 10 |
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 { | |||
745 | ASN1_TYPE *ASN1_TYPE_new(void); | 745 | ASN1_TYPE *ASN1_TYPE_new(void); |
746 | void ASN1_TYPE_free(ASN1_TYPE *a); | 746 | void ASN1_TYPE_free(ASN1_TYPE *a); |
747 | ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **a, const unsigned char **in, long len); | 747 | ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **a, const unsigned char **in, long len); |
748 | int i2d_ASN1_TYPE(const ASN1_TYPE *a, unsigned char **out); | 748 | int i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **out); |
749 | extern const ASN1_ITEM ASN1_ANY_it; | 749 | extern const ASN1_ITEM ASN1_ANY_it; |
750 | 750 | ||
751 | int ASN1_TYPE_get(ASN1_TYPE *a); | 751 | int ASN1_TYPE_get(ASN1_TYPE *a); |
@@ -879,18 +879,18 @@ extern const ASN1_ITEM ASN1_BMPSTRING_it; | |||
879 | ASN1_STRING *ASN1_PRINTABLE_new(void); | 879 | ASN1_STRING *ASN1_PRINTABLE_new(void); |
880 | void ASN1_PRINTABLE_free(ASN1_STRING *a); | 880 | void ASN1_PRINTABLE_free(ASN1_STRING *a); |
881 | ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a, const unsigned char **in, long len); | 881 | ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a, const unsigned char **in, long len); |
882 | int i2d_ASN1_PRINTABLE(const ASN1_STRING *a, unsigned char **out); | 882 | int i2d_ASN1_PRINTABLE(ASN1_STRING *a, unsigned char **out); |
883 | extern const ASN1_ITEM ASN1_PRINTABLE_it; | 883 | extern const ASN1_ITEM ASN1_PRINTABLE_it; |
884 | 884 | ||
885 | ASN1_STRING *DIRECTORYSTRING_new(void); | 885 | ASN1_STRING *DIRECTORYSTRING_new(void); |
886 | void DIRECTORYSTRING_free(ASN1_STRING *a); | 886 | void DIRECTORYSTRING_free(ASN1_STRING *a); |
887 | ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, const unsigned char **in, long len); | 887 | ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, const unsigned char **in, long len); |
888 | int i2d_DIRECTORYSTRING(const ASN1_STRING *a, unsigned char **out); | 888 | int i2d_DIRECTORYSTRING(ASN1_STRING *a, unsigned char **out); |
889 | extern const ASN1_ITEM DIRECTORYSTRING_it; | 889 | extern const ASN1_ITEM DIRECTORYSTRING_it; |
890 | ASN1_STRING *DISPLAYTEXT_new(void); | 890 | ASN1_STRING *DISPLAYTEXT_new(void); |
891 | void DISPLAYTEXT_free(ASN1_STRING *a); | 891 | void DISPLAYTEXT_free(ASN1_STRING *a); |
892 | ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, const unsigned char **in, long len); | 892 | ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, const unsigned char **in, long len); |
893 | int i2d_DISPLAYTEXT(const ASN1_STRING *a, unsigned char **out); | 893 | int i2d_DISPLAYTEXT(ASN1_STRING *a, unsigned char **out); |
894 | extern const ASN1_ITEM DISPLAYTEXT_it; | 894 | extern const ASN1_ITEM DISPLAYTEXT_it; |
895 | ASN1_PRINTABLESTRING *ASN1_PRINTABLESTRING_new(void); | 895 | ASN1_PRINTABLESTRING *ASN1_PRINTABLESTRING_new(void); |
896 | void ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a); | 896 | void ASN1_PRINTABLESTRING_free(ASN1_PRINTABLESTRING *a); |