aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGOTOU Yuuzou <gotoyuzo@notwork.org>2003-07-09 12:14:28 +0000
committerGOTOU Yuuzou <gotoyuzo@notwork.org>2003-07-09 12:14:28 +0000
commit1fde4e52509ad11a7b28b03565f7e7e18a9f6db5 (patch)
tree1b85f6b5179396f41f25c408bdb24398867dec4e
parent8b3f32cccbcc333149822b5d92a5923998d77652 (diff)
downloadruby-openssl-history-1fde4e52509ad11a7b28b03565f7e7e18a9f6db5.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog4
-rw-r--r--ossl_pkcs7.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 41e12b4..0f7fe46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed, 09 Jul 2003 21:09:10 +0900 -- GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ossl_pkcs7.c: write_smime(): should add PKCS7_DETACHED to flags
+ if the PKCS7 is detached and @data is given.
+
Wed, 09 Jul 2003 12:41:14 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz>
* extconf.rb: Start checking for OpenSSL' missing functions...
diff --git a/ossl_pkcs7.c b/ossl_pkcs7.c
index 372f5ed..2f2210e 100644
--- a/ossl_pkcs7.c
+++ b/ossl_pkcs7.c
@@ -133,6 +133,8 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
SafeGetPKCS7(pkcs7, p7);
flg = NIL_P(flags) ? 0 : NUM2INT(flags);
if(NIL_P(data)) data = ossl_pkcs7_get_data(pkcs7);
+ if(!NIL_P(data) && PKCS7_is_detached(p7))
+ flg |= PKCS7_DETACHED;
in = NIL_P(data) ? NULL : ossl_obj2bio(data);
if(!(out = BIO_new(BIO_s_mem()))){
BIO_free(in);