pkcs7: rename data fields

Rename data fields to use word 'content' rather than 'signed'. Other
PKCS#7 types have different usage types for these data elements.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>

diff --git a/lib/x509/pkcs7-sign.c b/lib/x509/pkcs7-sign.c
index 7ad8e33de05cf54e5122d07d6ad38ced4c268a3c..8191092bf44e629c9c117f5b5ea397cac78376fa 100644 (file)
--- a/lib/x509/pkcs7-sign.c
+++ b/lib/x509/pkcs7-sign.c
@@ -93,26 +93,26 @@ int _gnutls_pkcs7_decode_signed_data(gnutls_pkcs7_t pkcs7)
 
        /* Try reading as octet string according to rfc5652. If that fails, attempt
         * a raw read according to rfc2315 */
-       result = _gnutls_x509_read_string(c2, "encapContentInfo.eContent", &pkcs7->der_signed_data, ASN1_ETYPE_OCTET_STRING, 1);
+       result = _gnutls_x509_read_string(c2, "encapContentInfo.eContent", &pkcs7->der_encap_data, ASN1_ETYPE_OCTET_STRING, 1);
        if (result < 0) {
-               result = _gnutls_x509_read_value(c2, "encapContentInfo.eContent", &pkcs7->der_signed_data);
+               result = _gnutls_x509_read_value(c2, "encapContentInfo.eContent", &pkcs7->der_encap_data);
                if (result < 0) {
-                       pkcs7->der_signed_data.data = NULL;
-                       pkcs7->der_signed_data.size = 0;
+                       pkcs7->der_encap_data.data = NULL;
+                       pkcs7->der_encap_data.size = 0;
                } else {
                        int tag_len, len_len;
                        unsigned char cls;
                        unsigned long tag;
 
                        /* we skip the embedded element's tag and length - uncharted territorry - used by MICROSOFT_CERT_TRUST_LIST */
-                       result = asn1_get_tag_der(pkcs7->der_signed_data.data, pkcs7->der_signed_data.size, &cls, &tag_len, &tag);
+                       result = asn1_get_tag_der(pkcs7->der_encap_data.data, pkcs7->der_encap_data.size, &cls, &tag_len, &tag);
                        if (result != ASN1_SUCCESS) {
                                gnutls_assert();
                                result = _gnutls_asn2err(result);
                                goto cleanup;
                        }
 
-                       result = asn1_get_length_ber(pkcs7->der_signed_data.data+tag_len, pkcs7->der_signed_data.size-tag_len, &len_len);
+                       result = asn1_get_length_ber(pkcs7->der_encap_data.data+tag_len, pkcs7->der_encap_data.size-tag_len, &len_len);
                        if (result < 0) {
                                gnutls_assert();
                                result = GNUTLS_E_ASN1_DER_ERROR;
@@ -120,14 +120,14 @@ int _gnutls_pkcs7_decode_signed_data(gnutls_pkcs7_t pkcs7)
                        }
 
                        tag_len += len_len;
-                       memmove(pkcs7->der_signed_data.data, &pkcs7->der_signed_data.data[tag_len], pkcs7->der_signed_data.size-tag_len);
-                       pkcs7->der_signed_data.size-=tag_len;
+                       memmove(pkcs7->der_encap_data.data, &pkcs7->der_encap_data.data[tag_len], pkcs7->der_encap_data.size-tag_len);
+                       pkcs7->der_encap_data.size-=tag_len;
                }
        }
 
-       if (pkcs7->signed_data)
-               asn1_delete_structure(&pkcs7->signed_data);
-       pkcs7->signed_data = c2;
+       if (pkcs7->content_data)
+               asn1_delete_structure(&pkcs7->content_data);
+       pkcs7->content_data = c2;
        gnutls_free(tmp.data);
 
        return 0;
@@ -176,7 +176,7 @@ gnutls_pkcs7_get_crt_raw2(gnutls_pkcs7_t pkcs7,
 
        len = sizeof(oid) - 1;
 
-       result = asn1_read_value(pkcs7->signed_data, root2, oid, &len);
+       result = asn1_read_value(pkcs7->content_data, root2, oid, &len);
 
        if (result == ASN1_VALUE_NOT_FOUND) {
                result = GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
@@ -201,7 +201,7 @@ gnutls_pkcs7_get_crt_raw2(gnutls_pkcs7_t pkcs7,
                }
 
                result =
-                   asn1_der_decoding_startEnd(pkcs7->signed_data, tmp.data,
+                   asn1_der_decoding_startEnd(pkcs7->content_data, tmp.data,
                                               tmp.size, root2, &start, &end);
 
                if (result != ASN1_SUCCESS) {
@@ -288,7 +288,7 @@ int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7)
        /* Step 2. Count the CertificateSet */
 
        result =
-           asn1_number_of_elements(pkcs7->signed_data, "certificates", &count);
+           asn1_number_of_elements(pkcs7->content_data, "certificates", &count);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                return 0;       /* no certificates */
@@ -332,7 +332,7 @@ static time_t parse_time(gnutls_pkcs7_t pkcs7, const char *root)
        }
 
        len = sizeof(tval);
-       result = asn1_read_value(pkcs7->signed_data, root, tval, &len);
+       result = asn1_read_value(pkcs7->content_data, root, tval, &len);
        if (result != ASN1_SUCCESS) {
                ret = -1;
                gnutls_assert();
@@ -373,7 +373,7 @@ int gnutls_pkcs7_get_signature_count(gnutls_pkcs7_t pkcs7)
                return GNUTLS_E_INVALID_REQUEST;
 
        ret =
-           asn1_number_of_elements(pkcs7->signed_data, "signerInfos", &count);
+           asn1_number_of_elements(pkcs7->content_data, "signerInfos", &count);
        if (ret != ASN1_SUCCESS) {
                gnutls_assert();
                return 0;
@@ -415,7 +415,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
        info->signing_time = -1;
 
        ret =
-           asn1_number_of_elements(pkcs7->signed_data, "signerInfos", &count);
+           asn1_number_of_elements(pkcs7->content_data, "signerInfos", &count);
        if (ret != ASN1_SUCCESS || idx + 1 > (unsigned)count) {
                gnutls_assert();
                return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
@@ -424,7 +424,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                 "signerInfos.?%u.signatureAlgorithm.algorithm", idx + 1);
 
        len = sizeof(oid) - 1;
-       ret = asn1_read_value(pkcs7->signed_data, root, oid, &len);
+       ret = asn1_read_value(pkcs7->content_data, root, oid, &len);
        if (ret != ASN1_SUCCESS) {
                gnutls_assert();
                goto unsupp_algo;
@@ -444,7 +444,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                         "signerInfos.?%u.digestAlgorithm.algorithm", idx + 1);
 
                len = sizeof(oid) - 1;
-               ret = asn1_read_value(pkcs7->signed_data, root, oid, &len);
+               ret = asn1_read_value(pkcs7->content_data, root, oid, &len);
                if (ret != ASN1_SUCCESS) {
                        gnutls_assert();
                        goto unsupp_algo;
@@ -467,7 +467,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
 
        snprintf(root, sizeof(root), "signerInfos.?%u.signature", idx + 1);
        /* read the signature */
-       ret = _gnutls_x509_read_value(pkcs7->signed_data, root, &info->sig);
+       ret = _gnutls_x509_read_value(pkcs7->content_data, root, &info->sig);
        if (ret < 0) {
                gnutls_assert();
                goto fail;
@@ -479,7 +479,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                 idx + 1);
        /* read the signature */
        ret =
-           _gnutls_x509_get_raw_field(pkcs7->signed_data, root,
+           _gnutls_x509_get_raw_field(pkcs7->content_data, root,
                                       &info->issuer_dn);
        if (ret >= 0) {
                snprintf(root, sizeof(root),
@@ -487,7 +487,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                         idx + 1);
                /* read the signature */
                ret =
-                   _gnutls_x509_read_value(pkcs7->signed_data, root,
+                   _gnutls_x509_read_value(pkcs7->content_data, root,
                                            &info->signer_serial);
                if (ret < 0) {
                        gnutls_assert();
@@ -498,7 +498,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                         "signerInfos.?%u.sid.subjectKeyIdentifier", idx + 1);
                /* read the signature */
                ret =
-                   _gnutls_x509_read_value(pkcs7->signed_data, root,
+                   _gnutls_x509_read_value(pkcs7->content_data, root,
                                            &info->issuer_keyid);
                if (ret < 0) {
                        gnutls_assert();
@@ -516,7 +516,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                         "signerInfos.?%u.signedAttrs.?%u.type", idx + 1,
                         i + 1);
                len = sizeof(oid) - 1;
-               ret = asn1_read_value(pkcs7->signed_data, root, oid, &len);
+               ret = asn1_read_value(pkcs7->content_data, root, oid, &len);
                if (ret != ASN1_SUCCESS) {
                        break;
                }
@@ -524,7 +524,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                snprintf(root, sizeof(root),
                         "signerInfos.?%u.signedAttrs.?%u.values.?1", idx + 1,
                         i + 1);
-               ret = _gnutls_x509_read_value(pkcs7->signed_data, root, &tmp);
+               ret = _gnutls_x509_read_value(pkcs7->content_data, root, &tmp);
                if (ret == GNUTLS_E_ASN1_ELEMENT_NOT_FOUND) {
                        tmp.data = NULL;
                        tmp.size = 0;
@@ -552,7 +552,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                         "signerInfos.?%u.unsignedAttrs.?%u.type", idx + 1,
                         i + 1);
                len = sizeof(oid) - 1;
-               ret = asn1_read_value(pkcs7->signed_data, root, oid, &len);
+               ret = asn1_read_value(pkcs7->content_data, root, oid, &len);
                if (ret != ASN1_SUCCESS) {
                        break;
                }
@@ -560,7 +560,7 @@ int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
                snprintf(root, sizeof(root),
                         "signerInfos.?%u.unsignedAttrs.?%u.values.?1", idx + 1,
                         i + 1);
-               ret = _gnutls_x509_read_value(pkcs7->signed_data, root, &tmp);
+               ret = _gnutls_x509_read_value(pkcs7->content_data, root, &tmp);
                if (ret == GNUTLS_E_ASN1_ELEMENT_NOT_FOUND) {
                        tmp.data = NULL;
                        tmp.size = 0;
@@ -614,7 +614,7 @@ static int verify_hash_attr(gnutls_pkcs7_t pkcs7, const char *root,
        hash_size = gnutls_hash_get_len(hash);
 
        if (data == NULL || data->data == NULL) {
-               data = &pkcs7->der_signed_data;
+               data = &pkcs7->der_encap_data;
        }
 
        if (data->size == 0) {
@@ -629,7 +629,7 @@ static int verify_hash_attr(gnutls_pkcs7_t pkcs7, const char *root,
        for (i = 0;; i++) {
                snprintf(name, sizeof(name), "%s.signedAttrs.?%u", root, i + 1);
 
-               ret = _gnutls_x509_decode_and_read_attribute(pkcs7->signed_data,
+               ret = _gnutls_x509_decode_and_read_attribute(pkcs7->content_data,
                                                             name, oid,
                                                             sizeof(oid), &tmp,
                                                             1, 0);
@@ -666,7 +666,7 @@ static int verify_hash_attr(gnutls_pkcs7_t pkcs7, const char *root,
 
                        /* check if it matches */
                        ret =
-                           _gnutls_x509_get_raw_field(pkcs7->signed_data,
+                           _gnutls_x509_get_raw_field(pkcs7->content_data,
                                                       "encapContentInfo.eContentType",
                                                       &tmp2);
                        if (ret < 0) {
@@ -710,7 +710,7 @@ static int figure_pkcs7_sigdata(gnutls_pkcs7_t pkcs7, const char *root,
 
        snprintf(name, sizeof(name), "%s.signedAttrs", root);
        /* read the signature */
-       ret = _gnutls_x509_get_raw_field(pkcs7->signed_data, name, sigdata);
+       ret = _gnutls_x509_get_raw_field(pkcs7->content_data, name, sigdata);
        if (ret == 0) {
                /* verify that hash matches */
                ret = verify_hash_attr(pkcs7, root, algo, data);
@@ -725,7 +725,7 @@ static int figure_pkcs7_sigdata(gnutls_pkcs7_t pkcs7, const char *root,
 
        /* We have no signedAttrs. Use the provided data, or the encapsulated */
        if (data == NULL || data->data == NULL) {
-               return _gnutls_set_datum(sigdata, pkcs7->der_signed_data.data, pkcs7->der_signed_data.size);
+               return _gnutls_set_datum(sigdata, pkcs7->der_encap_data.data, pkcs7->der_encap_data.size);
        }
 
        return _gnutls_set_datum(sigdata, data->data, data->size);
@@ -776,7 +776,7 @@ int gnutls_pkcs7_verify_direct(gnutls_pkcs7_t pkcs7,
                return GNUTLS_E_INVALID_REQUEST;
 
        ret =
-           asn1_number_of_elements(pkcs7->signed_data, "signerInfos", &count);
+           asn1_number_of_elements(pkcs7->content_data, "signerInfos", &count);
        if (ret != ASN1_SUCCESS || idx + 1 > (unsigned)count) {
                gnutls_assert();
                return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
@@ -1197,7 +1197,7 @@ int gnutls_pkcs7_verify(gnutls_pkcs7_t pkcs7,
                return GNUTLS_E_INVALID_REQUEST;
 
        ret =
-           asn1_number_of_elements(pkcs7->signed_data, "signerInfos", &count);
+           asn1_number_of_elements(pkcs7->content_data, "signerInfos", &count);
        if (ret != ASN1_SUCCESS || idx + 1 > (unsigned)count) {
                gnutls_assert();
                return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
@@ -1324,12 +1324,12 @@ int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crt)
        /* If the signed data are uninitialized
         * then create them.
         */
-       if (pkcs7->signed_data == NULL) {
+       if (pkcs7->content_data == NULL) {
                /* The pkcs7 structure is new, so create the
                 * signedData.
                 */
                result =
-                   create_empty_signed_data(pkcs7->pkcs7, &pkcs7->signed_data);
+                   create_empty_signed_data(pkcs7->pkcs7, &pkcs7->content_data);
                if (result < 0) {
                        gnutls_assert();
                        return result;
@@ -1339,7 +1339,7 @@ int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crt)
        /* Step 2. Append the new certificate.
         */
 
-       result = asn1_write_value(pkcs7->signed_data, "certificates", "NEW", 1);
+       result = asn1_write_value(pkcs7->content_data, "certificates", "NEW", 1);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                result = _gnutls_asn2err(result);
@@ -1347,7 +1347,7 @@ int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crt)
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data, "certificates.?LAST",
+           asn1_write_value(pkcs7->content_data, "certificates.?LAST",
                             "certificate", 1);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
@@ -1356,7 +1356,7 @@ int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crt)
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data,
+           asn1_write_value(pkcs7->content_data,
                             "certificates.?LAST.certificate", crt->data,
                             crt->size);
        if (result != ASN1_SUCCESS) {
@@ -1433,7 +1433,7 @@ int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx)
 
        snprintf(root2, sizeof(root2), "certificates.?%d", indx + 1);
 
-       result = asn1_write_value(pkcs7->signed_data, root2, NULL, 0);
+       result = asn1_write_value(pkcs7->content_data, root2, NULL, 0);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                result = _gnutls_asn2err(result);
@@ -1489,7 +1489,7 @@ gnutls_pkcs7_get_crl_raw2(gnutls_pkcs7_t pkcs7,
        /* Get the raw CRL
         */
        result =
-           asn1_der_decoding_startEnd(pkcs7->signed_data, tmp.data, tmp.size,
+           asn1_der_decoding_startEnd(pkcs7->content_data, tmp.data, tmp.size,
                                       root2, &start, &end);
 
        if (result != ASN1_SUCCESS) {
@@ -1569,7 +1569,7 @@ int gnutls_pkcs7_get_crl_count(gnutls_pkcs7_t pkcs7)
 
        /* Step 2. Count the CertificateSet */
 
-       result = asn1_number_of_elements(pkcs7->signed_data, "crls", &count);
+       result = asn1_number_of_elements(pkcs7->content_data, "crls", &count);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                return 0;       /* no crls */
@@ -1599,12 +1599,12 @@ int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crl)
        /* If the signed data are uninitialized
         * then create them.
         */
-       if (pkcs7->signed_data == NULL) {
+       if (pkcs7->content_data == NULL) {
                /* The pkcs7 structure is new, so create the
                 * signedData.
                 */
                result =
-                   create_empty_signed_data(pkcs7->pkcs7, &pkcs7->signed_data);
+                   create_empty_signed_data(pkcs7->pkcs7, &pkcs7->content_data);
                if (result < 0) {
                        gnutls_assert();
                        return result;
@@ -1614,7 +1614,7 @@ int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crl)
        /* Step 2. Append the new crl.
         */
 
-       result = asn1_write_value(pkcs7->signed_data, "crls", "NEW", 1);
+       result = asn1_write_value(pkcs7->content_data, "crls", "NEW", 1);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                result = _gnutls_asn2err(result);
@@ -1622,7 +1622,7 @@ int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crl)
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data, "crls.?LAST", crl->data,
+           asn1_write_value(pkcs7->content_data, "crls.?LAST", crl->data,
                             crl->size);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
@@ -1697,7 +1697,7 @@ int gnutls_pkcs7_delete_crl(gnutls_pkcs7_t pkcs7, int indx)
 
        snprintf(root2, sizeof(root2), "crls.?%d", indx + 1);
 
-       result = asn1_write_value(pkcs7->signed_data, root2, NULL, 0);
+       result = asn1_write_value(pkcs7->content_data, root2, NULL, 0);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                result = _gnutls_asn2err(result);
@@ -2010,11 +2010,11 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        if (pkcs7 == NULL || me == NULL)
                return GNUTLS_E_INVALID_REQUEST;
 
-       if (pkcs7->signed_data == NULL) {
+       if (pkcs7->content_data == NULL) {
                result =
                    asn1_create_element(_gnutls_get_pkix(),
                                        "PKIX1.pkcs-7-SignedData",
-                                       &pkcs7->signed_data);
+                                       &pkcs7->content_data);
                if (result != ASN1_SUCCESS) {
                        gnutls_assert();
                        ret = _gnutls_asn2err(result);
@@ -2022,19 +2022,19 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
                }
 
                if (!(flags & GNUTLS_PKCS7_EMBED_DATA)) {
-                       (void)asn1_write_value(pkcs7->signed_data,
+                       (void)asn1_write_value(pkcs7->content_data,
                                         "encapContentInfo.eContent", NULL, 0);
                }
        }
 
-       result = asn1_write_value(pkcs7->signed_data, "version", &one, 1);
+       result = asn1_write_value(pkcs7->content_data, "version", &one, 1);
        if (result != ASN1_SUCCESS) {
                ret = _gnutls_asn2err(result);
                goto cleanup;
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data,
+           asn1_write_value(pkcs7->content_data,
                             "encapContentInfo.eContentType", DATA_OID,
                             0);
        if (result != ASN1_SUCCESS) {
@@ -2044,7 +2044,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
 
        if ((flags & GNUTLS_PKCS7_EMBED_DATA) && data->data) {  /* embed data */
                ret =
-                   _gnutls_x509_write_string(pkcs7->signed_data,
+                   _gnutls_x509_write_string(pkcs7->content_data,
                                     "encapContentInfo.eContent", data,
                                     ASN1_ETYPE_OCTET_STRING);
                if (ret < 0) {
@@ -2062,7 +2062,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
 
        /* append digest info algorithm */
        result =
-           asn1_write_value(pkcs7->signed_data, "digestAlgorithms", "NEW", 1);
+           asn1_write_value(pkcs7->content_data, "digestAlgorithms", "NEW", 1);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                ret = _gnutls_asn2err(result);
@@ -2070,7 +2070,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data,
+           asn1_write_value(pkcs7->content_data,
                             "digestAlgorithms.?LAST.algorithm",
                             _gnutls_x509_digest_to_oid(me), 1);
        if (result != ASN1_SUCCESS) {
@@ -2079,11 +2079,11 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
                goto cleanup;
        }
 
-       (void)asn1_write_value(pkcs7->signed_data,
+       (void)asn1_write_value(pkcs7->content_data,
                         "digestAlgorithms.?LAST.parameters", NULL, 0);
 
        /* append signer's info */
-       result = asn1_write_value(pkcs7->signed_data, "signerInfos", "NEW", 1);
+       result = asn1_write_value(pkcs7->content_data, "signerInfos", "NEW", 1);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
                ret = _gnutls_asn2err(result);
@@ -2091,7 +2091,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data, "signerInfos.?LAST.version",
+           asn1_write_value(pkcs7->content_data, "signerInfos.?LAST.version",
                             &one, 1);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();
@@ -2100,7 +2100,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data,
+           asn1_write_value(pkcs7->content_data,
                             "signerInfos.?LAST.digestAlgorithm.algorithm",
                             _gnutls_x509_digest_to_oid(me), 1);
        if (result != ASN1_SUCCESS) {
@@ -2109,12 +2109,12 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
                goto cleanup;
        }
 
-       (void)asn1_write_value(pkcs7->signed_data,
+       (void)asn1_write_value(pkcs7->content_data,
                         "signerInfos.?LAST.digestAlgorithm.parameters", NULL,
                         0);
 
        ret =
-           write_signer_id(pkcs7->signed_data, "signerInfos.?LAST", signer,
+           write_signer_id(pkcs7->content_data, "signerInfos.?LAST", signer,
                            flags);
        if (ret < 0) {
                gnutls_assert();
@@ -2122,7 +2122,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        }
 
        ret =
-           add_attrs(pkcs7->signed_data, "signerInfos.?LAST.unsignedAttrs",
+           add_attrs(pkcs7->content_data, "signerInfos.?LAST.unsignedAttrs",
                      unsigned_attrs, 0);
        if (ret < 0) {
                gnutls_assert();
@@ -2130,7 +2130,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        }
 
        ret =
-           write_attributes(pkcs7->signed_data,
+           write_attributes(pkcs7->content_data,
                             "signerInfos.?LAST.signedAttrs", data, me,
                             signed_attrs, flags);
        if (ret < 0) {
@@ -2173,7 +2173,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
         */
        params.legacy = 1;
        ret =
-           _gnutls_x509_write_sign_params(pkcs7->signed_data,
+           _gnutls_x509_write_sign_params(pkcs7->content_data,
                                           "signerInfos.?LAST.signatureAlgorithm",
                                           se, &params);
        if (ret < 0) {
@@ -2202,7 +2202,7 @@ int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7,
        }
 
        result =
-           asn1_write_value(pkcs7->signed_data, "signerInfos.?LAST.signature",
+           asn1_write_value(pkcs7->content_data, "signerInfos.?LAST.signature",
                             signature.data, signature.size);
        if (result != ASN1_SUCCESS) {
                gnutls_assert();

diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index b10faa3a3b8d57095c3e7d235a14f95599a3f37a..baa5127f0fab25319341d648cfc37844301b0b6c 100644 (file)
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -90,10 +90,10 @@ void gnutls_pkcs7_deinit(gnutls_pkcs7_t pkcs7)
        if (pkcs7->pkcs7)
                asn1_delete_structure(&pkcs7->pkcs7);
 
-       if (pkcs7->signed_data)
-               asn1_delete_structure(&pkcs7->signed_data);
+       if (pkcs7->content_data)
+               asn1_delete_structure(&pkcs7->content_data);
 
-       _gnutls_free_datum(&pkcs7->der_signed_data);
+       _gnutls_free_datum(&pkcs7->der_encap_data);
 
        gnutls_free(pkcs7);
 }
@@ -216,16 +216,16 @@ gnutls_pkcs7_get_embedded_data(gnutls_pkcs7_t pkcs7, unsigned flags,
        if (pkcs7 == NULL)
                return GNUTLS_E_INVALID_REQUEST;
 
-       if (pkcs7->der_signed_data.size == 0)
+       if (pkcs7->der_encap_data.size == 0)
                return gnutls_assert_val(GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE);
 
        if (flags & GNUTLS_PKCS7_EDATA_GET_RAW) {
-               if (pkcs7->signed_data == NULL)
+               if (pkcs7->content_data == NULL)
                        return gnutls_assert_val(GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE);
 
-               return _gnutls_x509_read_value(pkcs7->signed_data, "encapContentInfo.eContent", data);
+               return _gnutls_x509_read_value(pkcs7->content_data, "encapContentInfo.eContent", data);
        } else {
-               return _gnutls_set_datum(data, pkcs7->der_signed_data.data, pkcs7->der_signed_data.size);
+               return _gnutls_set_datum(data, pkcs7->der_encap_data.data, pkcs7->der_encap_data.size);
        }
 }
 
@@ -258,15 +258,15 @@ static void disable_opt_fields(gnutls_pkcs7_t pkcs7)
        int count;
 
        /* disable the optional fields */
-       result = asn1_number_of_elements(pkcs7->signed_data, "crls", &count);
+       result = asn1_number_of_elements(pkcs7->content_data, "crls", &count);
        if (result != ASN1_SUCCESS || count == 0) {
-               (void)asn1_write_value(pkcs7->signed_data, "crls", NULL, 0);
+               (void)asn1_write_value(pkcs7->content_data, "crls", NULL, 0);
        }
 
        result =
-           asn1_number_of_elements(pkcs7->signed_data, "certificates", &count);
+           asn1_number_of_elements(pkcs7->content_data, "certificates", &count);
        if (result != ASN1_SUCCESS || count == 0) {
-               (void)asn1_write_value(pkcs7->signed_data, "certificates", NULL, 0);
+               (void)asn1_write_value(pkcs7->content_data, "certificates", NULL, 0);
        }
 
        return;
@@ -276,13 +276,13 @@ static int reencode(gnutls_pkcs7_t pkcs7)
 {
        int result;
 
-       if (pkcs7->signed_data != NULL) {
+       if (pkcs7->content_data != NULL) {
                disable_opt_fields(pkcs7);
 
                /* Replace the old content with the new
                 */
                result =
-                   _gnutls_x509_der_encode_and_copy(pkcs7->signed_data, "",
+                   _gnutls_x509_der_encode_and_copy(pkcs7->content_data, "",
                                                     pkcs7->pkcs7, "content",
                                                     0);
                if (result < 0) {

diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index 55cbd240abd6c30dc1627ce9166da808a5ada18c..085a1a70bd891c59839cd2ed86b5c20215fa4c93 100644 (file)
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -126,8 +126,8 @@ typedef struct gnutls_pkcs7_int {
 
        char encap_data_oid[MAX_OID_SIZE];
 
-       gnutls_datum_t der_signed_data;
-       asn1_node signed_data;
+       gnutls_datum_t der_encap_data;
+       asn1_node content_data;
 } gnutls_pkcs7_int;
 
 struct pbkdf2_params {