2 files changed, 2 insertions, 42 deletions
diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h
index 2a3f5b740d..234fdca1ea 100644
--- a/src/lib/libcrypto/ossl_typ.h
+++ b/src/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;
diff --git a/src/lib/libssl/src/crypto/ossl_typ.h b/src/lib/libssl/src/crypto/ossl_typ.h
index 2a3f5b740d..234fdca1ea 100644
--- a/src/lib/libssl/src/crypto/ossl_typ.h
+++ b/src/lib/libssl/src/crypto/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;

diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h index 2a3f5b740d..234fdca1ea 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ossl_typ.h,v 1.12 2014/06/12 15:49:27 deraadt Exp $ */	1	/* $OpenBSD: ossl_typ.h,v 1.13 2015/09/30 04:10:07 doug Exp $ */
2	/* ====================================================================	2	/* ====================================================================
3	* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.	3	* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
4	*	4	*
@@ -58,25 +58,6 @@
58		58
59	#include <openssl/opensslconf.h>	59	#include <openssl/opensslconf.h>
60		60
61	#ifdef NO_ASN1_TYPEDEFS
62	#define ASN1_INTEGER ASN1_STRING
63	#define ASN1_ENUMERATED ASN1_STRING
64	#define ASN1_BIT_STRING ASN1_STRING
65	#define ASN1_OCTET_STRING ASN1_STRING
66	#define ASN1_PRINTABLESTRING ASN1_STRING
67	#define ASN1_T61STRING ASN1_STRING
68	#define ASN1_IA5STRING ASN1_STRING
69	#define ASN1_UTCTIME ASN1_STRING
70	#define ASN1_GENERALIZEDTIME ASN1_STRING
71	#define ASN1_TIME ASN1_STRING
72	#define ASN1_GENERALSTRING ASN1_STRING
73	#define ASN1_UNIVERSALSTRING ASN1_STRING
74	#define ASN1_BMPSTRING ASN1_STRING
75	#define ASN1_VISIBLESTRING ASN1_STRING
76	#define ASN1_UTF8STRING ASN1_STRING
77	#define ASN1_BOOLEAN int
78	#define ASN1_NULL int
79	#else
80	typedef struct asn1_string_st ASN1_INTEGER;	61	typedef struct asn1_string_st ASN1_INTEGER;
81	typedef struct asn1_string_st ASN1_ENUMERATED;	62	typedef struct asn1_string_st ASN1_ENUMERATED;
82	typedef struct asn1_string_st ASN1_BIT_STRING;	63	typedef struct asn1_string_st ASN1_BIT_STRING;
@@ -95,7 +76,6 @@ typedef struct asn1_string_st ASN1_UTF8STRING;
95	typedef struct asn1_string_st ASN1_STRING;	76	typedef struct asn1_string_st ASN1_STRING;
96	typedef int ASN1_BOOLEAN;	77	typedef int ASN1_BOOLEAN;
97	typedef int ASN1_NULL;	78	typedef int ASN1_NULL;
98	#endif
99		79
100	typedef struct ASN1_ITEM_st ASN1_ITEM;	80	typedef struct ASN1_ITEM_st ASN1_ITEM;
101	typedef struct asn1_pctx_st ASN1_PCTX;	81	typedef struct asn1_pctx_st ASN1_PCTX;


diff --git a/src/lib/libssl/src/crypto/ossl_typ.h b/src/lib/libssl/src/crypto/ossl_typ.h index 2a3f5b740d..234fdca1ea 100644 --- a/src/lib/libssl/src/crypto/ossl_typ.h +++ b/src/lib/libssl/src/crypto/ossl_typ.h
@@ -1,4 +1,4 @@
1	/* $OpenBSD: ossl_typ.h,v 1.12 2014/06/12 15:49:27 deraadt Exp $ */	1	/* $OpenBSD: ossl_typ.h,v 1.13 2015/09/30 04:10:07 doug Exp $ */
2	/* ====================================================================	2	/* ====================================================================
3	* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.	3	* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
4	*	4	*
@@ -58,25 +58,6 @@
58		58
59	#include <openssl/opensslconf.h>	59	#include <openssl/opensslconf.h>
60		60
61	#ifdef NO_ASN1_TYPEDEFS
62	#define ASN1_INTEGER ASN1_STRING
63	#define ASN1_ENUMERATED ASN1_STRING
64	#define ASN1_BIT_STRING ASN1_STRING
65	#define ASN1_OCTET_STRING ASN1_STRING
66	#define ASN1_PRINTABLESTRING ASN1_STRING
67	#define ASN1_T61STRING ASN1_STRING
68	#define ASN1_IA5STRING ASN1_STRING
69	#define ASN1_UTCTIME ASN1_STRING
70	#define ASN1_GENERALIZEDTIME ASN1_STRING
71	#define ASN1_TIME ASN1_STRING
72	#define ASN1_GENERALSTRING ASN1_STRING
73	#define ASN1_UNIVERSALSTRING ASN1_STRING
74	#define ASN1_BMPSTRING ASN1_STRING
75	#define ASN1_VISIBLESTRING ASN1_STRING
76	#define ASN1_UTF8STRING ASN1_STRING
77	#define ASN1_BOOLEAN int
78	#define ASN1_NULL int
79	#else
80	typedef struct asn1_string_st ASN1_INTEGER;	61	typedef struct asn1_string_st ASN1_INTEGER;
81	typedef struct asn1_string_st ASN1_ENUMERATED;	62	typedef struct asn1_string_st ASN1_ENUMERATED;
82	typedef struct asn1_string_st ASN1_BIT_STRING;	63	typedef struct asn1_string_st ASN1_BIT_STRING;
@@ -95,7 +76,6 @@ typedef struct asn1_string_st ASN1_UTF8STRING;
95	typedef struct asn1_string_st ASN1_STRING;	76	typedef struct asn1_string_st ASN1_STRING;
96	typedef int ASN1_BOOLEAN;	77	typedef int ASN1_BOOLEAN;
97	typedef int ASN1_NULL;	78	typedef int ASN1_NULL;
98	#endif
99		79
100	typedef struct ASN1_ITEM_st ASN1_ITEM;	80	typedef struct ASN1_ITEM_st ASN1_ITEM;
101	typedef struct asn1_pctx_st ASN1_PCTX;	81	typedef struct asn1_pctx_st ASN1_PCTX;