oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add flags to generate detached signatures.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20168 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-02-03 22:45:20 +00:00
parent 1820a1f17b
commit 5f1b3a853b
1 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/hx509/cms.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003 - 2006 Kungliga Tekniska H<>gskolan * Copyright (c) 2003 - 2007 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -302,6 +302,11 @@ hx509_cms_unenvelope(hx509_context context,
goto out; goto out;
} }
enccontent = encryptedContent; enccontent = encryptedContent;
} else if (encryptedContent != NULL) {
ret = HX509_CMS_NO_DATA_AVAILABLE;
hx509_set_error_string(context, 0, ret,
"Both internal and external encrypted data");
goto out;
} }
cert = NULL; cert = NULL;
@@ -423,6 +428,7 @@ out:
int int
hx509_cms_envelope_1(hx509_context context, hx509_cms_envelope_1(hx509_context context,
int flags,
hx509_cert cert, hx509_cert cert,
const void *data, const void *data,
size_t length, size_t length,
@@ -621,6 +627,7 @@ hx509_cms_verify_signed(hx509_context context,
hx509_verify_ctx ctx, hx509_verify_ctx ctx,
const void *data, const void *data,
size_t length, size_t length,
const heim_octet_string *signedContent,
hx509_certs store, hx509_certs store,
heim_oid *contentType, heim_oid *contentType,
heim_octet_string *content, heim_octet_string *content,
@@ -648,12 +655,20 @@ hx509_cms_verify_signed(hx509_context context,
goto out; goto out;
} }
if (sd.encapContentInfo.eContent == NULL) { if (sd.encapContentInfo.eContent == NULL && signedContent == NULL) {
ret = HX509_CMS_NO_DATA_AVAILABLE; ret = HX509_CMS_NO_DATA_AVAILABLE;
hx509_set_error_string(context, 0, ret, hx509_set_error_string(context, 0, ret,
"No content data in SignedData"); "No content data in SignedData");
goto out; goto out;
} }
if (sd.encapContentInfo.eContent && signedContent) {
ret = HX509_CMS_NO_DATA_AVAILABLE;
hx509_set_error_string(context, 0, ret,
"Both external and internal SignedData");
goto out;
}
if (sd.encapContentInfo.eContent)
signedContent = sd.encapContentInfo.eContent;
ret = hx509_certs_init(context, "MEMORY:cms-cert-buffer", ret = hx509_certs_init(context, "MEMORY:cms-cert-buffer",
0, NULL, &certs); 0, NULL, &certs);
@@ -739,7 +754,7 @@ hx509_cms_verify_signed(hx509_context context,
ret = _hx509_verify_signature(context, ret = _hx509_verify_signature(context,
NULL, NULL,
&signer_info->digestAlgorithm, &signer_info->digestAlgorithm,
sd.encapContentInfo.eContent, signedContent,
&os); &os);
der_free_octet_string(&os); der_free_octet_string(&os);
if (ret) { if (ret) {
@@ -801,7 +816,7 @@ hx509_cms_verify_signed(hx509_context context,
_hx509_abort("internal ASN.1 encoder error"); _hx509_abort("internal ASN.1 encoder error");
} else { } else {
signed_data = sd.encapContentInfo.eContent; signed_data = rk_UNCONST(signedContent);
match_oid = oid_id_pkcs7_data(); match_oid = oid_id_pkcs7_data();
} }
@@ -824,7 +839,7 @@ hx509_cms_verify_signed(hx509_context context,
"Failed to verify sigature in " "Failed to verify sigature in "
"CMS SignedData"); "CMS SignedData");
} }
if (signed_data != sd.encapContentInfo.eContent) { if (signed_data != signedContent) {
der_free_octet_string(signed_data); der_free_octet_string(signed_data);
free(signed_data); free(signed_data);
} }
@@ -861,14 +876,14 @@ hx509_cms_verify_signed(hx509_context context,
goto out; goto out;
} }
content->data = malloc(sd.encapContentInfo.eContent->length); content->data = malloc(signedContent->length);
if (content->data == NULL) { if (content->data == NULL) {
hx509_clear_error_string(context); hx509_clear_error_string(context);
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
content->length = sd.encapContentInfo.eContent->length; content->length = signedContent->length;
memcpy(content->data,sd.encapContentInfo.eContent->data,content->length); memcpy(content->data, signedContent->data, content->length);
out: out:
free_SignedData(&sd); free_SignedData(&sd);
@@ -918,6 +933,7 @@ add_one_attribute(Attribute **attr,
int int
hx509_cms_create_signed_1(hx509_context context, hx509_cms_create_signed_1(hx509_context context,
int flags,
const heim_oid *eContentType, const heim_oid *eContentType,
const void *data, size_t length, const void *data, size_t length,
const AlgorithmIdentifier *digest_alg, const AlgorithmIdentifier *digest_alg,
@@ -930,7 +946,7 @@ hx509_cms_create_signed_1(hx509_context context,
AlgorithmIdentifier digest; AlgorithmIdentifier digest;
hx509_name name; hx509_name name;
SignerInfo *signer_info; SignerInfo *signer_info;
heim_octet_string buf; heim_octet_string buf, content;
SignedData sd; SignedData sd;
int ret; int ret;
size_t size; size_t size;
@@ -941,6 +957,9 @@ hx509_cms_create_signed_1(hx509_context context,
memset(&path, 0, sizeof(path)); memset(&path, 0, sizeof(path));
memset(&digest, 0, sizeof(digest)); memset(&digest, 0, sizeof(digest));
content.data = rk_UNCONST(data);
content.length = length;
if (_hx509_cert_private_key(cert) == NULL) { if (_hx509_cert_private_key(cert) == NULL) {
hx509_set_error_string(context, 0, HX509_PRIVATE_KEY_MISSING, hx509_set_error_string(context, 0, HX509_PRIVATE_KEY_MISSING,
"Private key missing for signing"); "Private key missing for signing");
@@ -961,21 +980,25 @@ hx509_cms_create_signed_1(hx509_context context,
sd.version = CMSVersion_v3; sd.version = CMSVersion_v3;
der_copy_oid(eContentType, &sd.encapContentInfo.eContentType); der_copy_oid(eContentType, &sd.encapContentInfo.eContentType);
ALLOC(sd.encapContentInfo.eContent, 1);
if (sd.encapContentInfo.eContent == NULL) {
hx509_clear_error_string(context);
ret = ENOMEM;
goto out;
}
sd.encapContentInfo.eContent->data = malloc(length); /* */
if (sd.encapContentInfo.eContent->data == NULL) { if ((flags & HX509_CMS_SIGATURE_DETACHED) == 0) {
hx509_clear_error_string(context); ALLOC(sd.encapContentInfo.eContent, 1);
ret = ENOMEM; if (sd.encapContentInfo.eContent == NULL) {
goto out; hx509_clear_error_string(context);
ret = ENOMEM;
goto out;
}
sd.encapContentInfo.eContent->data = malloc(length);
if (sd.encapContentInfo.eContent->data == NULL) {
hx509_clear_error_string(context);
ret = ENOMEM;
goto out;
}
memcpy(sd.encapContentInfo.eContent->data, data, length);
sd.encapContentInfo.eContent->length = length;
} }
memcpy(sd.encapContentInfo.eContent->data, data, length);
sd.encapContentInfo.eContent->length = length;
ALLOC_SEQ(&sd.signerInfos, 1); ALLOC_SEQ(&sd.signerInfos, 1);
if (sd.signerInfos.val == NULL) { if (sd.signerInfos.val == NULL) {
@@ -1015,7 +1038,7 @@ hx509_cms_create_signed_1(hx509_context context,
ret = _hx509_create_signature(context, ret = _hx509_create_signature(context,
NULL, NULL,
&digest, &digest,
sd.encapContentInfo.eContent, &content,
NULL, NULL,
&sig); &sig);
if (ret) { if (ret) {