tests: updated pkcs7-gen to account for content-type attribute

diff --git a/tests/pkcs7-gen.c b/tests/pkcs7-gen.c
index 39120eb3c7a510432c9ab1af9f66cf75e94ce1dd..f7c51a9afc02a8523b9200588c6495984c823c9b 100644 (file)
--- a/tests/pkcs7-gen.c
+++ b/tests/pkcs7-gen.c
@@ -175,13 +175,13 @@ void doit(void)
                exit(1);
        }
 
-       ret = gnutls_pkcs7_get_attr(info.signed_attrs, 1, &oid, &data, GNUTLS_PKCS7_ATTR_ENCODE_OCTET_STRING);
+       ret = gnutls_pkcs7_get_attr(info.signed_attrs, 1, &oid, &data, 0);
        if (ret < 0) {
                fail("error in %d: %s\n", __LINE__, gnutls_strerror(ret));
                exit(1);
        }
 
-       if (strcmp(oid, "1.2.3.4") != 0 || data.size != data1.size || memcmp(data.data, data1.data, data.size) != 0) {
+       if (strcmp(oid, "1.2.840.113549.1.9.3") != 0) {
                fail("error in %d: %s\n", __LINE__, oid);
                exit(1);
        }
@@ -193,6 +193,18 @@ void doit(void)
                exit(1);
        }
 
+       if (strcmp(oid, "1.2.3.4") != 0 || data.size != data1.size || memcmp(data.data, data1.data, data.size) != 0) {
+               fail("error in %d: %s\n", __LINE__, oid);
+               exit(1);
+       }
+       gnutls_free(data.data);
+
+       ret = gnutls_pkcs7_get_attr(info.signed_attrs, 3, &oid, &data, GNUTLS_PKCS7_ATTR_ENCODE_OCTET_STRING);
+       if (ret < 0) {
+               fail("error in %d: %s\n", __LINE__, gnutls_strerror(ret));
+               exit(1);
+       }
+
        if (strcmp(oid, "2.3.4") != 0 || data.size != data2.size || memcmp(data.data, data2.data, data.size) != 0) {
                fail("error in %d: %s\n", __LINE__, oid);
                exit(1);