diff options
| author | tedu <> | 2014-04-18 02:56:48 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-18 02:56:48 +0000 |
| commit | 9ccd24caa14ffa139f5a90bae5d5bce19a74e61d (patch) | |
| tree | 2dc4f3a055a0c21cce5721515377374b1b1ac411 | |
| parent | 39e8f809a7c170942a9f36e41adaf98cb94a7337 (diff) | |
| download | openbsd-9ccd24caa14ffa139f5a90bae5d5bce19a74e61d.tar.gz openbsd-9ccd24caa14ffa139f5a90bae5d5bce19a74e61d.tar.bz2 openbsd-9ccd24caa14ffa139f5a90bae5d5bce19a74e61d.zip | |
-netware
| -rw-r--r-- | src/lib/libcrypto/pkcs7/bio_pk7.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/pkcs7/bio_pk7.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/libcrypto/pkcs7/bio_pk7.c b/src/lib/libcrypto/pkcs7/bio_pk7.c index 0fd31e730f..2b04a361ac 100644 --- a/src/lib/libcrypto/pkcs7/bio_pk7.c +++ b/src/lib/libcrypto/pkcs7/bio_pk7.c | |||
| @@ -56,14 +56,10 @@ | |||
| 56 | #include <openssl/pkcs7.h> | 56 | #include <openssl/pkcs7.h> |
| 57 | #include <openssl/bio.h> | 57 | #include <openssl/bio.h> |
| 58 | 58 | ||
| 59 | #if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) | ||
| 60 | #include <memory.h> | ||
| 61 | #endif | ||
| 62 | #include <stdio.h> | 59 | #include <stdio.h> |
| 63 | 60 | ||
| 64 | /* Streaming encode support for PKCS#7 */ | 61 | /* Streaming encode support for PKCS#7 */ |
| 65 | |||
| 66 | BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7) | 62 | BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7) |
| 67 | { | 63 | { |
| 68 | return BIO_new_NDEF(out, (ASN1_VALUE *)p7, ASN1_ITEM_rptr(PKCS7)); | 64 | return BIO_new_NDEF(out, (ASN1_VALUE *)p7, ASN1_ITEM_rptr(PKCS7)); |
| 69 | } | 65 | } |
diff --git a/src/lib/libssl/src/crypto/pkcs7/bio_pk7.c b/src/lib/libssl/src/crypto/pkcs7/bio_pk7.c index 0fd31e730f..2b04a361ac 100644 --- a/src/lib/libssl/src/crypto/pkcs7/bio_pk7.c +++ b/src/lib/libssl/src/crypto/pkcs7/bio_pk7.c | |||
| @@ -56,14 +56,10 @@ | |||
| 56 | #include <openssl/pkcs7.h> | 56 | #include <openssl/pkcs7.h> |
| 57 | #include <openssl/bio.h> | 57 | #include <openssl/bio.h> |
| 58 | 58 | ||
| 59 | #if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) | ||
| 60 | #include <memory.h> | ||
| 61 | #endif | ||
| 62 | #include <stdio.h> | 59 | #include <stdio.h> |
| 63 | 60 | ||
| 64 | /* Streaming encode support for PKCS#7 */ | 61 | /* Streaming encode support for PKCS#7 */ |
| 65 | |||
| 66 | BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7) | 62 | BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7) |
| 67 | { | 63 | { |
| 68 | return BIO_new_NDEF(out, (ASN1_VALUE *)p7, ASN1_ITEM_rptr(PKCS7)); | 64 | return BIO_new_NDEF(out, (ASN1_VALUE *)p7, ASN1_ITEM_rptr(PKCS7)); |
| 69 | } | 65 | } |
