OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
15-Mar-2008 01:02:23
Branch: HEAD Handle:
2008031500022201
Modified files:
openssl CHANGES
openssl/crypto/cms cms.h cms_err.c cms_smime.c
Log:
Return error if no cipher set for encrypted data type.
Update CHANGES.
Summary:
Revision Changes Path
1.1406 +3 -3 openssl/CHANGES
1.6 +2 -0 openssl/crypto/cms/cms.h
1.5 +2 -0 openssl/crypto/cms/cms_err.c
1.4 +5 -0 openssl/crypto/cms/cms_smime.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/CHANGES
============================================================
================
$ cvs diff -u -r1.1405 -r1.1406 CHANGES
--- openssl/CHANGES 12 Mar 2008 21:14:16 -0000 1.1405
+++ openssl/CHANGES 15 Mar 2008 00:02:22 -0000 1.1406
-6,9 +6,9
*) Initial support for Cryptographic Message Syntax
(aka CMS) based
on RFC3850, RFC3851 and RFC3852. New cms directory
and cms utility,
- support for data, signedData, compressedData types
currently included,
- more to come. Scripts to check against RFC4134
examples draft and internal
- consistency.
+ support for data, signedData, compressedData,
digestedData and
+ encryptedData types currently included, more to
come. Scripts to
+ check against RFC4134 examples draft.
[Steve Henson]
*) Zlib compression BIO. This is a filter BIO which
compressed and
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms.h
============================================================
================
$ cvs diff -u -r1.5 -r1.6 cms.h
--- openssl/crypto/cms/cms.h 14 Mar 2008 23:30:56
-0000 1.5
+++ openssl/crypto/cms/cms.h 15 Mar 2008 00:02:23
-0000 1.6
-273,6 +273,7
#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO 148
#define CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO 138
#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT 140
+#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT 149
#define CMS_F_CMS_ENCRYPTEDDATA_INIT_BIO 147
#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY 141
#define CMS_F_CMS_ENCRYPTED_DATA_DECRYPT 139
-322,6 +323,7
#define CMS_R_NOT_ENCRYPTED_DATA 143
#define CMS_R_NOT_KEY_TRANSPORT 114
#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 115
+#define CMS_R_NO_CIPHER 144
#define CMS_R_NO_CONTENT 116
#define CMS_R_NO_DEFAULT_DIGEST 117
#define CMS_R_NO_DIGEST_SET 118
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_err.c
============================================================
================
$ cvs diff -u -r1.4 -r1.5 cms_err.c
--- openssl/crypto/cms/cms_err.c 14 Mar 2008 19:37:55
-0000 1.4
+++ openssl/crypto/cms/cms_err.c 15 Mar 2008 00:02:23
-0000 1.5
-94,6 +94,7
{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO), "CMS_EN
CRYPTEDCONTENT_INIT_BIO"},
{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_TO_BIO), "CMS_ENCR
YPTEDCONTENT_TO_BIO"},
{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_DECRYPT), "CMS_Encryp
tedData_decrypt"},
+{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT), "CMS_Encry
ptedData_encrypt"},
{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_INIT_BIO), "CMS_ENCRY
PTEDDATA_INIT_BIO"},
{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY), "CMS_Encry
ptedData_set1_key"},
{ERR_FUNC(CMS_F_CMS_ENCRYPTED_DATA_DECRYPT), "CMS_ENCRY
PTED_DATA_DECRYPT"},
-146,6 +147,7
{ERR_REASON(CMS_R_NOT_ENCRYPTED_DATA) ,"not
encrypted data"},
{ERR_REASON(CMS_R_NOT_KEY_TRANSPORT) ,"not key
transport"},
{ERR_REASON(CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),"not
supported for this key type"},
+{ERR_REASON(CMS_R_NO_CIPHER) ,"no
cipher"},
{ERR_REASON(CMS_R_NO_CONTENT) ,"no
content"},
{ERR_REASON(CMS_R_NO_DEFAULT_DIGEST) ,"no
default digest"},
{ERR_REASON(CMS_R_NO_DIGEST_SET) ,"no digest
set"},
.
patch -p0 <<' .'
Index: openssl/crypto/cms/cms_smime.c
============================================================
================
$ cvs diff -u -r1.3 -r1.4 cms_smime.c
--- openssl/crypto/cms/cms_smime.c 14 Mar 2008 19:37:56
-0000 1.3
+++ openssl/crypto/cms/cms_smime.c 15 Mar 2008 00:02:23
-0000 1.4
-227,6 +227,11
unsigned int flags)
{
CMS_ContentInfo *cms;
+ if (!cipher)
+ {
+ CMSerr(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT,
CMS_R_NO_CIPHER);
+ return NULL;
+ }
cms = CMS_ContentInfo_new();
if (!cms)
return NULL;
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
