diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/ossl_typ.h | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/ossl_typ.h')
| -rw-r--r-- | src/lib/libcrypto/ossl_typ.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h index 12bd7014de..ea9227f6f9 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h | |||
| @@ -91,10 +91,12 @@ typedef struct asn1_string_st ASN1_TIME; | |||
| 91 | typedef struct asn1_string_st ASN1_GENERALIZEDTIME; | 91 | typedef struct asn1_string_st ASN1_GENERALIZEDTIME; |
| 92 | typedef struct asn1_string_st ASN1_VISIBLESTRING; | 92 | typedef struct asn1_string_st ASN1_VISIBLESTRING; |
| 93 | typedef struct asn1_string_st ASN1_UTF8STRING; | 93 | typedef struct asn1_string_st ASN1_UTF8STRING; |
| 94 | typedef struct asn1_string_st ASN1_STRING; | ||
| 94 | typedef int ASN1_BOOLEAN; | 95 | typedef int ASN1_BOOLEAN; |
| 95 | typedef int ASN1_NULL; | 96 | typedef int ASN1_NULL; |
| 96 | #endif | 97 | #endif |
| 97 | 98 | ||
| 99 | typedef struct ASN1_ITEM_st ASN1_ITEM; | ||
| 98 | typedef struct asn1_pctx_st ASN1_PCTX; | 100 | typedef struct asn1_pctx_st ASN1_PCTX; |
| 99 | 101 | ||
| 100 | #ifdef OPENSSL_SYS_WIN32 | 102 | #ifdef OPENSSL_SYS_WIN32 |