diff options
| author | Doug Hogan <doug@cvs.openbsd.org> | 2015-09-30 04:10:08 +0000 |
|---|---|---|
| committer | Doug Hogan <doug@cvs.openbsd.org> | 2015-09-30 04:10:08 +0000 |
| commit | e5a16f2f2193d735b7456670bb3892fe2a0217ca (patch) | |
| tree | 75515645e43aa818161e137f9e7fda5ca8bad33f /lib | |
| parent | 50eec33d6acec8196c9f259c754bc9608b5f20b6 (diff) | |
Remove support for NO_ASN1_TYPEDEFS.
This ifdef was introduced 15 years ago and was known to cause problems
with STACK_OF() back then.
ok jsing@, beck@, jca@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/ossl_typ.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/libcrypto/ossl_typ.h b/lib/libcrypto/ossl_typ.h index 2a3f5b740de..234fdca1ea8 100644 --- a/lib/libcrypto/ossl_typ.h +++ b/lib/libcrypto/ossl_typ.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ossl_typ.h,v 1.12 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: ossl_typ.h,v 1.13 2015/09/30 04:10:07 doug Exp $ */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. * @@ -58,25 +58,6 @@ #include <openssl/opensslconf.h> -#ifdef NO_ASN1_TYPEDEFS -#define ASN1_INTEGER ASN1_STRING -#define ASN1_ENUMERATED ASN1_STRING -#define ASN1_BIT_STRING ASN1_STRING -#define ASN1_OCTET_STRING ASN1_STRING -#define ASN1_PRINTABLESTRING ASN1_STRING -#define ASN1_T61STRING ASN1_STRING -#define ASN1_IA5STRING ASN1_STRING -#define ASN1_UTCTIME ASN1_STRING -#define ASN1_GENERALIZEDTIME ASN1_STRING -#define ASN1_TIME ASN1_STRING -#define ASN1_GENERALSTRING ASN1_STRING -#define ASN1_UNIVERSALSTRING ASN1_STRING -#define ASN1_BMPSTRING ASN1_STRING -#define ASN1_VISIBLESTRING ASN1_STRING -#define ASN1_UTF8STRING ASN1_STRING -#define ASN1_BOOLEAN int -#define ASN1_NULL int -#else typedef struct asn1_string_st ASN1_INTEGER; typedef struct asn1_string_st ASN1_ENUMERATED; typedef struct asn1_string_st ASN1_BIT_STRING; @@ -95,7 +76,6 @@ typedef struct asn1_string_st ASN1_UTF8STRING; typedef struct asn1_string_st ASN1_STRING; typedef int ASN1_BOOLEAN; typedef int ASN1_NULL; -#endif typedef struct ASN1_ITEM_st ASN1_ITEM; typedef struct asn1_pctx_st ASN1_PCTX; |