diff options
author | tedu <> | 2014-04-18 02:56:48 +0000 |
---|---|---|
committer | tedu <> | 2014-04-18 02:56:48 +0000 |
commit | 0a67455153f1c0678e24f73ea923a92660c9e011 (patch) | |
tree | 2dc4f3a055a0c21cce5721515377374b1b1ac411 /src | |
parent | 357b674c69939cf99b5921e36e22d481164618d1 (diff) | |
download | openbsd-0a67455153f1c0678e24f73ea923a92660c9e011.tar.gz openbsd-0a67455153f1c0678e24f73ea923a92660c9e011.tar.bz2 openbsd-0a67455153f1c0678e24f73ea923a92660c9e011.zip |
-netware
Diffstat (limited to 'src')
-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 | } |