diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/ossl_typ.h | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to '')
| -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 734200428f..0e7a380880 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h | |||
| @@ -100,6 +100,8 @@ typedef int ASN1_NULL; | |||
| 100 | #undef X509_EXTENSIONS | 100 | #undef X509_EXTENSIONS |
| 101 | #undef X509_CERT_PAIR | 101 | #undef X509_CERT_PAIR |
| 102 | #undef PKCS7_ISSUER_AND_SERIAL | 102 | #undef PKCS7_ISSUER_AND_SERIAL |
| 103 | #undef OCSP_REQUEST | ||
| 104 | #undef OCSP_RESPONSE | ||
| 103 | #endif | 105 | #endif |
| 104 | 106 | ||
| 105 | #ifdef BIGNUM | 107 | #ifdef BIGNUM |