]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
pkcs7-crypt: use _gnutls_x509_write_uint32 as possible
authorDaiki Ueno <ueno@gnu.org>
Tue, 14 May 2024 01:48:43 +0000 (10:48 +0900)
committerDaiki Ueno <ueno@gnu.org>
Tue, 14 May 2024 01:51:05 +0000 (10:51 +0900)
Signed-off-by: Daiki Ueno <ueno@gnu.org>
lib/x509/pkcs7-crypt.c

index 0b1b57fe2a28ced37fe43bd9a0cb22e515c4703b..cb1b093504c6843ab7d7f30074106fa1e50ee201 100644 (file)
@@ -1287,7 +1287,6 @@ static int write_pbkdf2_params(asn1_node pasn,
 {
        int result;
        asn1_node pbkdf2_asn = NULL;
-       uint8_t tmp[MAX_OID_SIZE];
        const mac_entry_st *me;
 
        /* Write the key derivation algorithm
@@ -1329,12 +1328,10 @@ static int write_pbkdf2_params(asn1_node pasn,
 
        /* write the iteration count 
         */
-       _gnutls_write_uint32(kdf_params->iter_count, tmp);
-
-       result = asn1_write_value(pbkdf2_asn, "iterationCount", tmp, 4);
-       if (result != ASN1_SUCCESS) {
+       result = _gnutls_x509_write_uint32(pbkdf2_asn, "iterationCount",
+                                          kdf_params->iter_count);
+       if (result < 0) {
                gnutls_assert();
-               result = _gnutls_asn2err(result);
                goto error;
        }
        _gnutls_hard_log("iterationCount: %d\n", kdf_params->iter_count);