PKCS7: consistently name API

Signed-off-by: Stephan Mueller <smueller@chronox.de>

Author: smuellerDD

apps/src/lc_pkcs7_generator.c

@@ -170,7 +170,7 @@ static int pkcs7_enc_dump(struct pkcs7_generator_opts *opts,
 	if (!opts->print_pkcs7 && !opts->checker)
 		return 0;
 
-	CKINT(lc_pkcs7_message_parse(ppkcs7, pkcs7_data, pkcs7_datalen));
+	CKINT(lc_pkcs7_decode(ppkcs7, pkcs7_data, pkcs7_datalen));
 
 	if (opts->data) {
 		CKINT(lc_pkcs7_set_data(ppkcs7, opts->data, opts->datalen, 0));
@@ -207,7 +207,7 @@ static int pkcs7_dump_file(struct pkcs7_generator_opts *opts)
 	CKINT_LOG(get_data(opts->pkcs7_msg, &pkcs7_data, &pkcs7_datalen),
 		  "Loading of file %s failed\n", opts->pkcs7_msg);
 
-	CKINT_LOG(lc_pkcs7_message_parse(ppkcs7, pkcs7_data, pkcs7_datalen),
+	CKINT_LOG(lc_pkcs7_decode(ppkcs7, pkcs7_data, pkcs7_datalen),
 		  "Parsing of input file %s failed\n", opts->pkcs7_msg);
 
 	if (opts->data) {
@@ -240,7 +240,7 @@ static int pkcs7_gen_message(struct pkcs7_generator_opts *opts)
 	size_t avail_datalen = sizeof(data), datalen;
 	int ret;
 
-	CKINT_LOG(lc_pkcs7_generate(pkcs7, data, &avail_datalen),
+	CKINT_LOG(lc_pkcs7_encode(pkcs7, data, &avail_datalen),
 		  "Message generation failed\n");
 	datalen = sizeof(data) - avail_datalen;
 

asn1/api/lc_pkcs7_generator.h

@@ -53,7 +53,7 @@ extern "C" {
 
 /**
  * @ingroup PKCS7Gen
- * @brief Generate a PKCS#7 message
+ * @brief Encode a PKCS#7 message
  *
  * The function generates a PKCS#7 data blob from the filled PKCS#7 data
  * structure.
@@ -69,8 +69,8 @@ extern "C" {
  *
  * @return 0 on success or < 0 on error
  */
-int lc_pkcs7_generate(const struct lc_pkcs7_message *pkcs7, uint8_t *data,
-		      size_t *avail_datalen);
+int lc_pkcs7_encode(const struct lc_pkcs7_message *pkcs7, uint8_t *data,
+		    size_t *avail_datalen);
 
 /**
  * @ingroup PKCS7Gen

asn1/api/lc_pkcs7_parser.h

@@ -78,7 +78,7 @@
 
 /**
  * @ingroup PKCS7
- * @brief Parse a PKCS#7 message
+ * @brief Decode a PKCS#7 message
  *
  * The function parses a PKCS#7 data buffer into a data structure that allows
  * accessing the various data points of the PKCS#7 message.
@@ -104,8 +104,8 @@
  *
  * @return 0 on success or < 0 on error
  */
-int lc_pkcs7_message_parse(struct lc_pkcs7_message *pkcs7, const uint8_t *data,
-			   size_t datalen);
+int lc_pkcs7_decode(struct lc_pkcs7_message *pkcs7, const uint8_t *data,
+		    size_t datalen);
 
 /**
  * @ingroup PKCS7

asn1/src/pkcs7_generator.c

@@ -1091,7 +1091,7 @@ static inline int pkcs7_initialize_ctx(struct pkcs7_generate_context *ctx,
 	return ret;
 }
 
-LC_INTERFACE_FUNCTION(int, lc_pkcs7_generate,
+LC_INTERFACE_FUNCTION(int, lc_pkcs7_encode,
 		      const struct lc_pkcs7_message *pkcs7, uint8_t *data,
 		      size_t *avail_datalen)
 {

asn1/src/pkcs7_parser.c

@@ -794,7 +794,7 @@ LC_INTERFACE_FUNCTION(void, lc_pkcs7_message_clear,
 	}
 }
 
-LC_INTERFACE_FUNCTION(int, lc_pkcs7_message_parse,
+LC_INTERFACE_FUNCTION(int, lc_pkcs7_decode,
 		      struct lc_pkcs7_message *pkcs7, const uint8_t *data,
 		      size_t datalen)
 {

asn1/tests/asn1_tester.c

@@ -68,7 +68,7 @@ static int pkcs7_load(const struct x509_checker_options *parsed_opts)
 	CKINT_LOG(get_data(parsed_opts->file, &data, &datalen),
 		  "mmap failure\n");
 
-	CKINT_LOG(lc_pkcs7_message_parse(&pkcs7_msg, data, datalen),
+	CKINT_LOG(lc_pkcs7_decode(&pkcs7_msg, data, datalen),
 		  "Parsing of message failed\n");
 
 	CKINT(apply_checks_pkcs7(&pkcs7_msg, parsed_opts));
@@ -101,7 +101,7 @@ static int pkcs7_load_and_verify(const struct x509_checker_options *parsed_opts)
 		  "mmap failure\n");
 
 	/* Parse message */
-	CKINT_LOG(lc_pkcs7_message_parse(&pkcs7_msg, data, datalen),
+	CKINT_LOG(lc_pkcs7_decode(&pkcs7_msg, data, datalen),
 		  "Parsing of message failed\n");
 
 	/* Supply detached data */

asn1/tests/pkcs7_trust_tester.c

@@ -65,7 +65,7 @@ static int pkcs7_trust_store(struct pkcs7_trust_options *opts)
 		CKINT_LOG(get_data(opts->verified_file, &verified_data,
 				   &verified_datalen),
 			  "Reading verification data\n");
-		CKINT_LOG(lc_pkcs7_message_parse(&pkcs7, pkcs7_data,
+		CKINT_LOG(lc_pkcs7_decode(&pkcs7, pkcs7_data,
 						 pkcs7_datalen),
 			  "Parsing of PKCS#7 message\n");
 		/* Supply detached data */