session_p UPDATE change enum typedefs to just enum

roman · michalvasko · commit 40862fb4a3c3 · 2024-11-06T14:24:33.000+01:00
diff --git a/src/server_config.c b/src/server_config.c
diff --git a/src/server_config_ks.c b/src/server_config_ks.c
@@ -162,7 +162,7 @@ nc_server_config_ks_del_asymmetric_key(struct nc_asymmetric_key *key)
 }
 
 static int
-nc_server_config_ks_asymmetric_keys(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_asymmetric_keys(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_keystore *ks = &server_opts.keystore;
     uint16_t i, asym_key_count;
@@ -180,7 +180,7 @@ nc_server_config_ks_asymmetric_keys(const struct lyd_node *node, NC_OPERATION op
 }
 
 int
-nc_server_config_ks_keystore(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_keystore(const struct lyd_node *node, enum nc_operation op)
 {
     (void) node;
 
@@ -203,7 +203,7 @@ nc_server_config_ks_create_asymmetric_key(const struct lyd_node *node)
 }
 
 static int
-nc_server_config_ks_asymmetric_key(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_asymmetric_key(const struct lyd_node *node, enum nc_operation op)
 {
     int ret = 0;
     struct nc_asymmetric_key *key;
@@ -226,7 +226,7 @@ nc_server_config_ks_asymmetric_key(const struct lyd_node *node, NC_OPERATION op)
 }
 
 static int
-nc_server_config_ks_public_key_format(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_public_key_format(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_asymmetric_key *key;
     const char *format;
@@ -252,7 +252,7 @@ nc_server_config_ks_public_key_format(const struct lyd_node *node, NC_OPERATION
 }
 
 static int
-nc_server_config_ks_public_key(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_public_key(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_asymmetric_key *key;
 
@@ -273,11 +273,11 @@ nc_server_config_ks_public_key(const struct lyd_node *node, NC_OPERATION op)
 }
 
 static int
-nc_server_config_ks_private_key_format(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_private_key_format(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_asymmetric_key *key;
     const char *format;
-    NC_PRIVKEY_FORMAT privkey_type;
+    enum nc_privkey_format privkey_type;
 
     (void) op;
 
@@ -302,7 +302,7 @@ nc_server_config_ks_private_key_format(const struct lyd_node *node, NC_OPERATION
 }
 
 static int
-nc_server_config_ks_cleartext_private_key(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_cleartext_private_key(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_asymmetric_key *key;
 
@@ -335,7 +335,7 @@ nc_server_config_ks_create_certificate(const struct lyd_node *node, struct nc_as
 }
 
 static int
-nc_server_config_ks_certificate(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_certificate(const struct lyd_node *node, enum nc_operation op)
 {
     int ret = 0;
     struct nc_asymmetric_key *key;
@@ -364,7 +364,7 @@ nc_server_config_ks_certificate(const struct lyd_node *node, NC_OPERATION op)
 }
 
 static int
-nc_server_config_ks_cert_data(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ks_cert_data(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_certificate *cert;
 
@@ -385,7 +385,7 @@ nc_server_config_ks_cert_data(const struct lyd_node *node, NC_OPERATION op)
 }
 
 int
-nc_server_config_parse_keystore(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_parse_keystore(const struct lyd_node *node, enum nc_operation op)
 {
     const char *name = LYD_NAME(node);
     int ret = 0;
@@ -419,7 +419,7 @@ nc_server_config_parse_keystore(const struct lyd_node *node, NC_OPERATION op)
 }
 
 int
-nc_server_config_fill_keystore(const struct lyd_node *data, NC_OPERATION op)
+nc_server_config_fill_keystore(const struct lyd_node *data, enum nc_operation op)
 {
     int ret = 0;
     uint32_t prev_lo;
diff --git a/src/server_config_p.h b/src/server_config_p.h
@@ -40,7 +40,7 @@ typedef enum {
  * @param[in] format Value of the YANG identityref.
  * @return Private key format on success, NC_PRIVKEY_FORMAT_UNKNOWN otherwise.
  */
-NC_PRIVKEY_FORMAT nc_server_config_get_private_key_type(const char *format);
+enum nc_privkey_format nc_server_config_get_private_key_type(const char *format);
 
 #endif /* NC_ENABLED_SSH_TLS */
 
@@ -73,7 +73,7 @@ int nc_server_config_realloc(const char *key_value, void **ptr, size_t size, uin
  * @param[in] module Module for which to parse the data - either ietf-netconf-server, ietf-keystore or ietf-truststore
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_parse_tree(const struct lyd_node *node, NC_OPERATION parent_op, NC_MODULE module);
+int nc_server_config_parse_tree(const struct lyd_node *node, enum nc_operation parent_op, NC_MODULE module);
 
 /**
  * @brief Configures the listen subtree in the ietf-netconf-server module.
@@ -82,7 +82,7 @@ int nc_server_config_parse_tree(const struct lyd_node *node, NC_OPERATION parent
  * @param[in] op Operation to be done on the subtree. Only does something if the operation is NC_OP_DELETE.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_listen(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_listen(const struct lyd_node *node, enum nc_operation op);
 
 /**
  * @brief Configures the Call Home subtree in the ietf-netconf-server module.
@@ -91,7 +91,7 @@ int nc_server_config_listen(const struct lyd_node *node, NC_OPERATION op);
  * @param[in] op Operation to be done on the subtree. Only does something if the operation is NC_OP_DELETE.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_ch(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_ch(const struct lyd_node *node, enum nc_operation op);
 
 #ifdef NC_ENABLED_SSH_TLS
 
@@ -104,7 +104,7 @@ int nc_server_config_ch(const struct lyd_node *node, NC_OPERATION op);
  * @param[in] op Operation saying what to do with the top-level node.
  * @return 0 either if keystore is not present or if it is and application was successful, 1 on error.
  */
-int nc_server_config_fill_keystore(const struct lyd_node *data, NC_OPERATION op);
+int nc_server_config_fill_keystore(const struct lyd_node *data, enum nc_operation op);
 
 /**
  * @brief Parse the given node, which belongs to the ietf-keystore subtree, and apply it's data to the server's configuration.
@@ -113,7 +113,7 @@ int nc_server_config_fill_keystore(const struct lyd_node *data, NC_OPERATION op)
  * @param[in] op Operation saying what to do with the node.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_parse_keystore(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_parse_keystore(const struct lyd_node *node, enum nc_operation op);
 
 /**
  * @brief Configures the keystore subtree in the ietf-keystore module.
@@ -122,7 +122,7 @@ int nc_server_config_parse_keystore(const struct lyd_node *node, NC_OPERATION op
  * @param[in] op Operation to be done on the subtree. Only does something if the operation is NC_OP_DELETE.
  * @return 0.
  */
-int nc_server_config_ks_keystore(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_ks_keystore(const struct lyd_node *node, enum nc_operation op);
 
 /** TRUSTSTORE **/
 
@@ -133,7 +133,7 @@ int nc_server_config_ks_keystore(const struct lyd_node *node, NC_OPERATION op);
  * @param[in] op Operation saying what to do with the top-level node.
  * @return 0 either if truststore is not present or if it is and application was successful, 1 on error.
  */
-int nc_server_config_fill_truststore(const struct lyd_node *data, NC_OPERATION op);
+int nc_server_config_fill_truststore(const struct lyd_node *data, enum nc_operation op);
 
 /**
  * @brief Parse the given node, which belongs to the ietf-truststore subtree, and apply it's data to the server's configuration.
@@ -142,7 +142,7 @@ int nc_server_config_fill_truststore(const struct lyd_node *data, NC_OPERATION o
  * @param[in] op Operation saying what to do with the node.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_parse_truststore(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_parse_truststore(const struct lyd_node *node, enum nc_operation op);
 
 /**
  * @brief Configures the truststore subtree in the ietf-truststore module.
@@ -151,7 +151,7 @@ int nc_server_config_parse_truststore(const struct lyd_node *node, NC_OPERATION
  * @param[in] op Operation to be done on the subtree. Only does something if the operation is NC_OP_DELETE.
  * @return 0.
  */
-int nc_server_config_ts_truststore(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_ts_truststore(const struct lyd_node *node, enum nc_operation op);
 
 /** LIBNETCONF2-NETCONF-SERVER **/
 
@@ -162,7 +162,7 @@ int nc_server_config_ts_truststore(const struct lyd_node *node, NC_OPERATION op)
  * @param[in] op Operation to be done on the subtree. Only does something if the operation is NC_OP_DELETE.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_ln2_netconf_server(const struct lyd_node *node, NC_OPERATION op);
+int nc_server_config_ln2_netconf_server(const struct lyd_node *node, enum nc_operation op);
 
 #endif /* NC_ENABLED_SSH_TLS */
 
diff --git a/src/server_config_ts.c b/src/server_config_ts.c
@@ -294,7 +294,7 @@ nc_server_config_ts_del_public_key_bag(struct nc_public_key_bag *pbag)
 }
 
 static int
-nc_server_config_ts_certificate_bags(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_certificate_bags(const struct lyd_node *node, enum nc_operation op)
 {
     uint16_t i, cert_bag_count;
     struct nc_truststore *ts = &server_opts.truststore;
@@ -312,7 +312,7 @@ nc_server_config_ts_certificate_bags(const struct lyd_node *node, NC_OPERATION o
 }
 
 static int
-nc_server_config_ts_public_key_bags(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_public_key_bags(const struct lyd_node *node, enum nc_operation op)
 {
     uint16_t i, pub_bag_count;
     struct nc_truststore *ts = &server_opts.truststore;
@@ -330,7 +330,7 @@ nc_server_config_ts_public_key_bags(const struct lyd_node *node, NC_OPERATION op
 }
 
 int
-nc_server_config_ts_truststore(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_truststore(const struct lyd_node *node, enum nc_operation op)
 {
     (void) node;
 
@@ -354,7 +354,7 @@ nc_server_config_ts_create_certificate_bag(const struct lyd_node *node)
 }
 
 static int
-nc_server_config_ts_certificate_bag(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_certificate_bag(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_certificate_bag *bag;
 
@@ -385,7 +385,7 @@ nc_server_config_ts_create_certificate(const struct lyd_node *node, struct nc_ce
 }
 
 static int
-nc_server_config_ts_certificate(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_certificate(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_certificate_bag *bag;
     struct nc_certificate *cert;
@@ -412,7 +412,7 @@ nc_server_config_ts_certificate(const struct lyd_node *node, NC_OPERATION op)
 }
 
 static int
-nc_server_config_ts_cert_data(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_cert_data(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_certificate *cert;
 
@@ -441,7 +441,7 @@ nc_server_config_ts_create_public_key_bag(const struct lyd_node *node)
 }
 
 static int
-nc_server_config_ts_public_key_bag(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_public_key_bag(const struct lyd_node *node, enum nc_operation op)
 {
     struct nc_public_key_bag *pbag;
 
@@ -472,7 +472,7 @@ nc_server_config_ts_create_public_key(const struct lyd_node *node, struct nc_pub
 }
 
 static int
-nc_server_config_ts_public_key(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_public_key(const struct lyd_node *node, enum nc_operation op)
 {
     int ret = 0;
     struct nc_public_key_bag *bag;
@@ -516,7 +516,7 @@ nc_server_config_ts_public_key(const struct lyd_node *node, NC_OPERATION op)
 }
 
 static int
-nc_server_config_ts_public_key_format(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_ts_public_key_format(const struct lyd_node *node, enum nc_operation op)
 {
     const char *format;
     struct nc_public_key *pkey;
@@ -540,7 +540,7 @@ nc_server_config_ts_public_key_format(const struct lyd_node *node, NC_OPERATION
 }
 
 int
-nc_server_config_parse_truststore(const struct lyd_node *node, NC_OPERATION op)
+nc_server_config_parse_truststore(const struct lyd_node *node, enum nc_operation op)
 {
     const char *name = LYD_NAME(node);
     int ret = 0;
@@ -574,7 +574,7 @@ nc_server_config_parse_truststore(const struct lyd_node *node, NC_OPERATION op)
 }
 
 int
-nc_server_config_fill_truststore(const struct lyd_node *data, NC_OPERATION op)
+nc_server_config_fill_truststore(const struct lyd_node *data, enum nc_operation op)
 {
     int ret = 0;
     uint32_t prev_lo;
diff --git a/src/server_config_util.c b/src/server_config_util.c
@@ -201,7 +201,7 @@ nc_server_config_check_delete(struct lyd_node **tree, const char *path_fmt, ...)
 #ifdef NC_ENABLED_SSH_TLS
 
 const char *
-nc_server_config_util_privkey_format_to_identityref(NC_PRIVKEY_FORMAT format)
+nc_server_config_util_privkey_format_to_identityref(enum nc_privkey_format format)
 {
     switch (format) {
     case NC_PRIVKEY_FORMAT_RSA:
@@ -635,7 +635,7 @@ nc_server_config_util_get_spki_pubkey_file(const char *pubkey_path, char **pubke
 }
 
 static int
-nc_server_config_util_get_privkey_format(const char *privkey, NC_PRIVKEY_FORMAT *privkey_format)
+nc_server_config_util_get_privkey_format(const char *privkey, enum nc_privkey_format *privkey_format)
 {
     NC_CHECK_ARG_RET(NULL, privkey, privkey_format, 1);
 
@@ -757,7 +757,7 @@ nc_server_config_util_pem_strip_header_footer(const char *pem, char **privkey)
 }
 
 static int
-nc_server_config_util_get_privkey(const char *privkey_path, NC_PRIVKEY_FORMAT *privkey_format, char **privkey, void **pkey)
+nc_server_config_util_get_privkey(const char *privkey_path, enum nc_privkey_format *privkey_format, char **privkey, void **pkey)
 {
     int ret = 0;
     FILE *f_privkey = NULL;
@@ -837,8 +837,8 @@ nc_server_config_util_get_privkey(const char *privkey_path, NC_PRIVKEY_FORMAT *p
 }
 
 int
-nc_server_config_util_get_asym_key_pair(const char *privkey_path, const char *pubkey_path, NC_PUBKEY_FORMAT wanted_pubkey_format,
-        char **privkey, NC_PRIVKEY_FORMAT *privkey_type, char **pubkey)
+nc_server_config_util_get_asym_key_pair(const char *privkey_path, const char *pubkey_path, enum nc_pubkey_format wanted_pubkey_format,
+        char **privkey, enum nc_privkey_format *privkey_type, char **pubkey)
 {
     int ret = 0;
     void *pkey = NULL;
@@ -1003,7 +1003,7 @@ nc_server_config_add_keystore_asym_key(const struct ly_ctx *ctx, NC_TRANSPORT_IM
 {
     int ret = 0;
     char *privkey = NULL, *pubkey = NULL;
-    NC_PRIVKEY_FORMAT privkey_type;
+    enum nc_privkey_format privkey_type;
     const char *privkey_format, *pubkey_format;
 
     NC_CHECK_ARG_RET(NULL, ctx, asym_key_name, privkey_path, config, 1);
diff --git a/src/server_config_util.h b/src/server_config_util.h
@@ -85,8 +85,8 @@ typedef enum {
  * @param[out] pubkey Base64 encoded public key.
  * @return 0 on success, non-zero otherwise.
  */
-int nc_server_config_util_get_asym_key_pair(const char *privkey_path, const char *pubkey_path, NC_PUBKEY_FORMAT wanted_pubkey_type,
-        char **privkey, NC_PRIVKEY_FORMAT *privkey_type, char **pubkey);
+int nc_server_config_util_get_asym_key_pair(const char *privkey_path, const char *pubkey_path, enum nc_pubkey_format wanted_pubkey_type,
+        char **privkey, enum nc_privkey_format *privkey_type, char **pubkey);
 
 /**
  * @brief Gets public key from a file and converts it to the SSH format if need be.
@@ -115,7 +115,7 @@ int nc_server_config_util_read_certificate(const char *cert_path, char **cert);
  *
  * @return Identityref on success, NULL on failure.
  */
-const char *nc_server_config_util_privkey_format_to_identityref(NC_PRIVKEY_FORMAT format);
+const char *nc_server_config_util_privkey_format_to_identityref(enum nc_privkey_format format);
 
 #endif /* NC_ENABLED_SSH_TLS */
 
diff --git a/src/server_config_util_ssh.c b/src/server_config_util_ssh.c
@@ -38,7 +38,7 @@ _nc_server_config_add_ssh_hostkey(const struct ly_ctx *ctx, const char *tree_pat
 {
     int ret = 0;
     char *pubkey = NULL, *privkey = NULL;
-    NC_PRIVKEY_FORMAT privkey_type;
+    enum nc_privkey_format privkey_type;
     const char *privkey_format, *pubkey_format = "ietf-crypto-types:ssh-public-key-format";
 
     NC_CHECK_ARG_RET(NULL, ctx, tree_path, privkey_path, config, 1);
diff --git a/src/server_config_util_tls.c b/src/server_config_util_tls.c
@@ -38,7 +38,7 @@ _nc_server_config_add_tls_server_cert(const struct ly_ctx *ctx, const char *tree
 {
     int ret = 0;
     char *privkey = NULL, *pubkey = NULL, *cert = NULL;
-    NC_PRIVKEY_FORMAT privkey_type;
+    enum nc_privkey_format privkey_type;
     const char *privkey_format, *pubkey_format = "ietf-crypto-types:subject-public-key-info-format";
 
     NC_CHECK_ARG_RET(NULL, ctx, tree_path, privkey_path, cert_path, config, 1);
diff --git a/src/session.c b/src/session.c
@@ -164,7 +164,7 @@ nc_base64der_to_cert(const char *data)
 }
 
 const char *
-nc_privkey_format_to_str(NC_PRIVKEY_FORMAT format)
+nc_privkey_format_to_str(enum nc_privkey_format format)
 {
     switch (format) {
     case NC_PRIVKEY_FORMAT_RSA:
diff --git a/src/session_p.h b/src/session_p.h
diff --git a/src/session_server_tls.c b/src/session_server_tls.c

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ nc_server_config_ks_del_asymmetric_key(struct nc_asymmetric_key *key)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`static int`
`165`		`-nc_server_config_ks_asymmetric_keys(const struct lyd_node *node, NC_OPERATION op)`
	`165`	`+nc_server_config_ks_asymmetric_keys(const struct lyd_node *node, enum nc_operation op)`
`166`	`166`	`{`
`167`	`167`	`struct nc_keystore *ks = &server_opts.keystore;`
`168`	`168`	`uint16_t i, asym_key_count;`
`@@ -180,7 +180,7 @@ nc_server_config_ks_asymmetric_keys(const struct lyd_node *node, NC_OPERATION op`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`int`
`183`		`-nc_server_config_ks_keystore(const struct lyd_node *node, NC_OPERATION op)`
	`183`	`+nc_server_config_ks_keystore(const struct lyd_node *node, enum nc_operation op)`
`184`	`184`	`{`
`185`	`185`	`(void) node;`
`186`	`186`
`@@ -203,7 +203,7 @@ nc_server_config_ks_create_asymmetric_key(const struct lyd_node *node)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`static int`
`206`		`-nc_server_config_ks_asymmetric_key(const struct lyd_node *node, NC_OPERATION op)`
	`206`	`+nc_server_config_ks_asymmetric_key(const struct lyd_node *node, enum nc_operation op)`
`207`	`207`	`{`
`208`	`208`	`int ret = 0;`
`209`	`209`	`struct nc_asymmetric_key *key;`
`@@ -226,7 +226,7 @@ nc_server_config_ks_asymmetric_key(const struct lyd_node *node, NC_OPERATION op)`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`static int`
`229`		`-nc_server_config_ks_public_key_format(const struct lyd_node *node, NC_OPERATION op)`
	`229`	`+nc_server_config_ks_public_key_format(const struct lyd_node *node, enum nc_operation op)`
`230`	`230`	`{`
`231`	`231`	`struct nc_asymmetric_key *key;`
`232`	`232`	`const char *format;`
`@@ -252,7 +252,7 @@ nc_server_config_ks_public_key_format(const struct lyd_node *node, NC_OPERATION`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`static int`
`255`		`-nc_server_config_ks_public_key(const struct lyd_node *node, NC_OPERATION op)`
	`255`	`+nc_server_config_ks_public_key(const struct lyd_node *node, enum nc_operation op)`
`256`	`256`	`{`
`257`	`257`	`struct nc_asymmetric_key *key;`
`258`	`258`
`@@ -273,11 +273,11 @@ nc_server_config_ks_public_key(const struct lyd_node *node, NC_OPERATION op)`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`static int`
`276`		`-nc_server_config_ks_private_key_format(const struct lyd_node *node, NC_OPERATION op)`
	`276`	`+nc_server_config_ks_private_key_format(const struct lyd_node *node, enum nc_operation op)`
`277`	`277`	`{`
`278`	`278`	`struct nc_asymmetric_key *key;`
`279`	`279`	`const char *format;`
`280`		`- NC_PRIVKEY_FORMAT privkey_type;`
	`280`	`+ enum nc_privkey_format privkey_type;`
`281`	`281`
`282`	`282`	`(void) op;`
`283`	`283`
`@@ -302,7 +302,7 @@ nc_server_config_ks_private_key_format(const struct lyd_node *node, NC_OPERATION`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`static int`
`305`		`-nc_server_config_ks_cleartext_private_key(const struct lyd_node *node, NC_OPERATION op)`
	`305`	`+nc_server_config_ks_cleartext_private_key(const struct lyd_node *node, enum nc_operation op)`
`306`	`306`	`{`
`307`	`307`	`struct nc_asymmetric_key *key;`
`308`	`308`
`@@ -335,7 +335,7 @@ nc_server_config_ks_create_certificate(const struct lyd_node *node, struct nc_as`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`static int`
`338`		`-nc_server_config_ks_certificate(const struct lyd_node *node, NC_OPERATION op)`
	`338`	`+nc_server_config_ks_certificate(const struct lyd_node *node, enum nc_operation op)`
`339`	`339`	`{`
`340`	`340`	`int ret = 0;`
`341`	`341`	`struct nc_asymmetric_key *key;`
`@@ -364,7 +364,7 @@ nc_server_config_ks_certificate(const struct lyd_node *node, NC_OPERATION op)`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`static int`
`367`		`-nc_server_config_ks_cert_data(const struct lyd_node *node, NC_OPERATION op)`
	`367`	`+nc_server_config_ks_cert_data(const struct lyd_node *node, enum nc_operation op)`
`368`	`368`	`{`
`369`	`369`	`struct nc_certificate *cert;`
`370`	`370`
`@@ -385,7 +385,7 @@ nc_server_config_ks_cert_data(const struct lyd_node *node, NC_OPERATION op)`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`int`
`388`		`-nc_server_config_parse_keystore(const struct lyd_node *node, NC_OPERATION op)`
	`388`	`+nc_server_config_parse_keystore(const struct lyd_node *node, enum nc_operation op)`
`389`	`389`	`{`
`390`	`390`	`const char *name = LYD_NAME(node);`
`391`	`391`	`int ret = 0;`
`@@ -419,7 +419,7 @@ nc_server_config_parse_keystore(const struct lyd_node *node, NC_OPERATION op)`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`int`
`422`		`-nc_server_config_fill_keystore(const struct lyd_node *data, NC_OPERATION op)`
	`422`	`+nc_server_config_fill_keystore(const struct lyd_node *data, enum nc_operation op)`
`423`	`423`	`{`
`424`	`424`	`int ret = 0;`
`425`	`425`	`uint32_t prev_lo;`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ nc_server_config_ts_del_public_key_bag(struct nc_public_key_bag *pbag)`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`static int`
`297`		`-nc_server_config_ts_certificate_bags(const struct lyd_node *node, NC_OPERATION op)`
	`297`	`+nc_server_config_ts_certificate_bags(const struct lyd_node *node, enum nc_operation op)`
`298`	`298`	`{`
`299`	`299`	`uint16_t i, cert_bag_count;`
`300`	`300`	`struct nc_truststore *ts = &server_opts.truststore;`
`@@ -312,7 +312,7 @@ nc_server_config_ts_certificate_bags(const struct lyd_node *node, NC_OPERATION o`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`static int`
`315`		`-nc_server_config_ts_public_key_bags(const struct lyd_node *node, NC_OPERATION op)`
	`315`	`+nc_server_config_ts_public_key_bags(const struct lyd_node *node, enum nc_operation op)`
`316`	`316`	`{`
`317`	`317`	`uint16_t i, pub_bag_count;`
`318`	`318`	`struct nc_truststore *ts = &server_opts.truststore;`
`@@ -330,7 +330,7 @@ nc_server_config_ts_public_key_bags(const struct lyd_node *node, NC_OPERATION op`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`int`
`333`		`-nc_server_config_ts_truststore(const struct lyd_node *node, NC_OPERATION op)`
	`333`	`+nc_server_config_ts_truststore(const struct lyd_node *node, enum nc_operation op)`
`334`	`334`	`{`
`335`	`335`	`(void) node;`
`336`	`336`
`@@ -354,7 +354,7 @@ nc_server_config_ts_create_certificate_bag(const struct lyd_node *node)`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`static int`
`357`		`-nc_server_config_ts_certificate_bag(const struct lyd_node *node, NC_OPERATION op)`
	`357`	`+nc_server_config_ts_certificate_bag(const struct lyd_node *node, enum nc_operation op)`
`358`	`358`	`{`
`359`	`359`	`struct nc_certificate_bag *bag;`
`360`	`360`
`@@ -385,7 +385,7 @@ nc_server_config_ts_create_certificate(const struct lyd_node *node, struct nc_ce`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`static int`
`388`		`-nc_server_config_ts_certificate(const struct lyd_node *node, NC_OPERATION op)`
	`388`	`+nc_server_config_ts_certificate(const struct lyd_node *node, enum nc_operation op)`
`389`	`389`	`{`
`390`	`390`	`struct nc_certificate_bag *bag;`
`391`	`391`	`struct nc_certificate *cert;`
`@@ -412,7 +412,7 @@ nc_server_config_ts_certificate(const struct lyd_node *node, NC_OPERATION op)`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`static int`
`415`		`-nc_server_config_ts_cert_data(const struct lyd_node *node, NC_OPERATION op)`
	`415`	`+nc_server_config_ts_cert_data(const struct lyd_node *node, enum nc_operation op)`
`416`	`416`	`{`
`417`	`417`	`struct nc_certificate *cert;`
`418`	`418`
`@@ -441,7 +441,7 @@ nc_server_config_ts_create_public_key_bag(const struct lyd_node *node)`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`static int`
`444`		`-nc_server_config_ts_public_key_bag(const struct lyd_node *node, NC_OPERATION op)`
	`444`	`+nc_server_config_ts_public_key_bag(const struct lyd_node *node, enum nc_operation op)`
`445`	`445`	`{`
`446`	`446`	`struct nc_public_key_bag *pbag;`
`447`	`447`
`@@ -472,7 +472,7 @@ nc_server_config_ts_create_public_key(const struct lyd_node *node, struct nc_pub`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`static int`
`475`		`-nc_server_config_ts_public_key(const struct lyd_node *node, NC_OPERATION op)`
	`475`	`+nc_server_config_ts_public_key(const struct lyd_node *node, enum nc_operation op)`
`476`	`476`	`{`
`477`	`477`	`int ret = 0;`
`478`	`478`	`struct nc_public_key_bag *bag;`
`@@ -516,7 +516,7 @@ nc_server_config_ts_public_key(const struct lyd_node *node, NC_OPERATION op)`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`static int`
`519`		`-nc_server_config_ts_public_key_format(const struct lyd_node *node, NC_OPERATION op)`
	`519`	`+nc_server_config_ts_public_key_format(const struct lyd_node *node, enum nc_operation op)`
`520`	`520`	`{`
`521`	`521`	`const char *format;`
`522`	`522`	`struct nc_public_key *pkey;`
`@@ -540,7 +540,7 @@ nc_server_config_ts_public_key_format(const struct lyd_node *node, NC_OPERATION`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`int`
`543`		`-nc_server_config_parse_truststore(const struct lyd_node *node, NC_OPERATION op)`
	`543`	`+nc_server_config_parse_truststore(const struct lyd_node *node, enum nc_operation op)`
`544`	`544`	`{`
`545`	`545`	`const char *name = LYD_NAME(node);`
`546`	`546`	`int ret = 0;`
`@@ -574,7 +574,7 @@ nc_server_config_parse_truststore(const struct lyd_node *node, NC_OPERATION op)`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`int`
`577`		`-nc_server_config_fill_truststore(const struct lyd_node *data, NC_OPERATION op)`
	`577`	`+nc_server_config_fill_truststore(const struct lyd_node *data, enum nc_operation op)`
`578`	`578`	`{`
`579`	`579`	`int ret = 0;`
`580`	`580`	`uint32_t prev_lo;`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ nc_server_config_check_delete(struct lyd_node *tree, const char path_fmt, ...)`
`201`	`201`	`#ifdef NC_ENABLED_SSH_TLS`
`202`	`202`
`203`	`203`	`const char *`
`204`		`-nc_server_config_util_privkey_format_to_identityref(NC_PRIVKEY_FORMAT format)`
	`204`	`+nc_server_config_util_privkey_format_to_identityref(enum nc_privkey_format format)`
`205`	`205`	`{`
`206`	`206`	`switch (format) {`
`207`	`207`	`case NC_PRIVKEY_FORMAT_RSA:`
`@@ -635,7 +635,7 @@ nc_server_config_util_get_spki_pubkey_file(const char pubkey_path, char *pubke`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`static int`
`638`		`-nc_server_config_util_get_privkey_format(const char privkey, NC_PRIVKEY_FORMAT privkey_format)`
	`638`	`+nc_server_config_util_get_privkey_format(const char privkey, enum nc_privkey_format privkey_format)`
`639`	`639`	`{`
`640`	`640`	`NC_CHECK_ARG_RET(NULL, privkey, privkey_format, 1);`
`641`	`641`
`@@ -757,7 +757,7 @@ nc_server_config_util_pem_strip_header_footer(const char pem, char *privkey)`
`757`	`757`	`}`
`758`	`758`
`759`	`759`	`static int`
`760`		`-nc_server_config_util_get_privkey(const char privkey_path, NC_PRIVKEY_FORMAT privkey_format, char privkey, void pkey)`
	`760`	`+nc_server_config_util_get_privkey(const char privkey_path, enum nc_privkey_format privkey_format, char privkey, void pkey)`
`761`	`761`	`{`
`762`	`762`	`int ret = 0;`
`763`	`763`	`FILE *f_privkey = NULL;`
`@@ -837,8 +837,8 @@ nc_server_config_util_get_privkey(const char privkey_path, NC_PRIVKEY_FORMAT p`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`int`
`840`		`-nc_server_config_util_get_asym_key_pair(const char privkey_path, const char pubkey_path, NC_PUBKEY_FORMAT wanted_pubkey_format,`
`841`		`- char *privkey, NC_PRIVKEY_FORMAT privkey_type, char **pubkey)`
	`840`	`+nc_server_config_util_get_asym_key_pair(const char privkey_path, const char pubkey_path, enum nc_pubkey_format wanted_pubkey_format,`
	`841`	`+ char *privkey, enum nc_privkey_format privkey_type, char **pubkey)`
`842`	`842`	`{`
`843`	`843`	`int ret = 0;`
`844`	`844`	`void *pkey = NULL;`
`@@ -1003,7 +1003,7 @@ nc_server_config_add_keystore_asym_key(const struct ly_ctx *ctx, NC_TRANSPORT_IM`
`1003`	`1003`	`{`
`1004`	`1004`	`int ret = 0;`
`1005`	`1005`	`char privkey = NULL, pubkey = NULL;`
`1006`		`- NC_PRIVKEY_FORMAT privkey_type;`
	`1006`	`+ enum nc_privkey_format privkey_type;`
`1007`	`1007`	`const char privkey_format, pubkey_format;`
`1008`	`1008`
`1009`	`1009`	`NC_CHECK_ARG_RET(NULL, ctx, asym_key_name, privkey_path, config, 1);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ _nc_server_config_add_ssh_hostkey(const struct ly_ctx ctx, const char tree_pat`
`38`	`38`	`{`
`39`	`39`	`int ret = 0;`
`40`	`40`	`char pubkey = NULL, privkey = NULL;`
`41`		`- NC_PRIVKEY_FORMAT privkey_type;`
	`41`	`+ enum nc_privkey_format privkey_type;`
`42`	`42`	`const char privkey_format, pubkey_format = "ietf-crypto-types:ssh-public-key-format";`
`43`	`43`
`44`	`44`	`NC_CHECK_ARG_RET(NULL, ctx, tree_path, privkey_path, config, 1);`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ nc_base64der_to_cert(const char *data)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`const char *`
`167`		`-nc_privkey_format_to_str(NC_PRIVKEY_FORMAT format)`
	`167`	`+nc_privkey_format_to_str(enum nc_privkey_format format)`
`168`	`168`	`{`
`169`	`169`	`switch (format) {`
`170`	`170`	`case NC_PRIVKEY_FORMAT_RSA:`