Update crypto_set API

Also few leftovers from cfg is removed and version of totempg is
increased to 5 to reflect all changes we made

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>

configure.ac

@@ -209,7 +209,7 @@ LINT_FLAGS="-weak -unrecog +posixlib +ignoresigns -fcnuse \
 	-badflag -D__gnuc_va_list=va_list -D__attribute\(x\)="
 
 # default libraries SONAME
-SOMAJOR="4"
+SOMAJOR="5"
 SOMINOR="0"
 SOMICRO="0"
 SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"

exec/totemiba.c

@@ -1253,7 +1253,8 @@ static void timer_function_netif_check_timeout (
 
 int totemiba_crypto_set (
 	void *iba_context,
-	unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 	struct totemiba_instance *instance = (struct totemiba_instance *)iba_context;
 	int res = 0;

exec/totemiba.h

@@ -108,7 +108,8 @@ extern int totemiba_token_target_set (
 
 extern int totemiba_crypto_set (
 	void *iba_context,
-	unsigned int type);
+	const char *cipher_type,
+	const char *hash_type);
 
 extern int totemiba_recv_mcast_empty (
 	void *iba_context);

exec/totemmrp.c

@@ -212,10 +212,12 @@ int totemmrp_ifaces_get (
 }
 
 int totemmrp_crypto_set (
-	unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 	return totemsrp_crypto_set (totemsrp_context,
-				    type);
+				    cipher_type,
+				    hash_type);
 }
 
 unsigned int totemmrp_my_nodeid_get (void)

exec/totemmrp.h

@@ -113,7 +113,7 @@ extern unsigned int totemmrp_my_nodeid_get (void);
 
 extern int totemmrp_my_family_get (void);
 
-extern int totemmrp_crypto_set (unsigned int);
+extern int totemmrp_crypto_set (const char *cipher_type, const char *hash_type);
 
 extern int totemmrp_ring_reenable (void);
 

exec/totemnet.c

@@ -116,7 +116,8 @@ struct transport {
 
 	int (*crypto_set) (
 		void *transport_context,
-		unsigned int type);
+		const char *cipher_type,
+		const char *hash_type);
 
 	int (*recv_mcast_empty) (
 		void *transport_context);
@@ -244,12 +245,14 @@ static void totemnet_instance_initialize (
 
 int totemnet_crypto_set (
 	void *net_context,
-	 unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 	struct totemnet_instance *instance = (struct totemnet_instance *)net_context;
 	int res = 0;
 
-	res = instance->transport->crypto_set (instance->transport_context, type);
+	res = instance->transport->crypto_set (instance->transport_context,
+	    cipher_type, hash_type);
 
 	return res;
 }

exec/totemnet.h

@@ -118,7 +118,8 @@ extern int totemnet_token_target_set (
 
 extern int totemnet_crypto_set (
 	void *net_context,
-	unsigned int type);
+	const char *cipher_type,
+	const char *hash_type);
 
 extern int totemnet_recv_mcast_empty (
 	void *net_context);

exec/totempg.c

@@ -1384,12 +1384,12 @@ void* totempg_get_stats (void)
 }
 
 int totempg_crypto_set (
-	unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 	int res;
 
-	res = totemmrp_crypto_set (
-		type);
+	res = totemmrp_crypto_set (cipher_type, hash_type);
 
 	return (res);
 }

exec/totemrrp.c

@@ -2080,12 +2080,13 @@ int totemrrp_ifaces_get (
 
 int totemrrp_crypto_set (
 	void *rrp_context,
-	unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 	struct totemrrp_instance *instance = (struct totemrrp_instance *)rrp_context;
 	int res;
 
-	res = totemnet_crypto_set(instance->net_handles[0], type);
+	res = totemnet_crypto_set(instance->net_handles[0], cipher_type, hash_type);
 
 	return (res);
 }

exec/totemrrp.h

@@ -130,7 +130,8 @@ extern int totemrrp_ifaces_get (
 
 extern int totemrrp_crypto_set (
 	void *rrp_context,
-	unsigned int type);
+	const char *cipher_type,
+	const char *hash_type);
 
 extern int totemrrp_ring_reenable (
 	void *rrp_context,

exec/totemsrp.c

@@ -1032,12 +1032,13 @@ finish:
 
 int totemsrp_crypto_set (
 	void *srp_context,
-	unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 	struct totemsrp_instance *instance = (struct totemsrp_instance *)srp_context;
 	int res;
 
-	res = totemrrp_crypto_set(instance->totemrrp_context, type);
+	res = totemrrp_crypto_set(instance->totemrrp_context, cipher_type, hash_type);
 
 	return (res);
 }

exec/totemsrp.h

@@ -114,7 +114,8 @@ extern int totemsrp_my_family_get (
 
 extern int totemsrp_crypto_set (
 	void *srp_context,
-	unsigned int type);
+	const char *cipher_type,
+	const char *hash_type);
 
 extern int totemsrp_ring_reenable (
 	void *srp_context);

exec/totemudp.c

@@ -238,7 +238,8 @@ do {												\
 
 int totemudp_crypto_set (
 	void *udp_context,
-	 unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 
 	return (0);

exec/totemudp.h

@@ -108,7 +108,8 @@ extern int totemudp_token_target_set (
 
 extern int totemudp_crypto_set (
 	void *udp_context,
-	unsigned int type);
+	const char *cipher_type,
+	const char *hash_type);
 
 extern int totemudp_recv_mcast_empty (
 	void *udp_context);

exec/totemudpu.c

@@ -226,7 +226,8 @@ do {												\
 
 int totemudpu_crypto_set (
 	void *udpu_context,
-	 unsigned int type)
+	const char *cipher_type,
+	const char *hash_type)
 {
 
 	return (0);

exec/totemudpu.h

@@ -108,7 +108,8 @@ extern int totemudpu_token_target_set (
 
 extern int totemudpu_crypto_set (
 	void *udpu_context,
-	unsigned int type);
+	const char *cipher_type,
+	const char *hash_type);
 
 extern int totemudpu_recv_mcast_empty (
 	void *udpu_context);

include/corosync/cfg.h

@@ -157,11 +157,6 @@ corosync_cfg_local_get (
 	corosync_cfg_handle_t handle,
 	unsigned int *local_nodeid);
 
-cs_error_t
-corosync_cfg_crypto_set (
-	corosync_cfg_handle_t handle,
-	unsigned int type);
-
 #ifdef __cplusplus
 }
 #endif

include/corosync/coroapi.h

@@ -241,7 +241,7 @@ struct corosync_api_v1 {
 
 	const char *(*totem_ip_print) (const struct totem_ip_address *addr);
 
-	int (*totem_crypto_set) (unsigned int type);
+	int (*totem_crypto_set) (const char *cipher_type, const char *hash_type);
 
 	int (*totem_callback_token_create) (
 		void **handle_out,

include/corosync/ipc_cfg.h

@@ -141,15 +141,6 @@ struct res_lib_cfg_local_get {
 	mar_uint32_t local_nodeid __attribute__((aligned(8)));
 };
 
-struct req_lib_cfg_crypto_set {
-	struct qb_ipc_response_header header __attribute__((aligned(8)));
-	mar_uint32_t type __attribute__((aligned(8)));
-};
-
-struct res_lib_cfg_crypto_set {
-	struct qb_ipc_response_header header __attribute__((aligned(8)));
-};
-
 typedef enum {
 	AIS_AMF_ADMINISTRATIVETARGET_SERVICEUNIT = 0,
 	AIS_AMF_ADMINISTRATIVETARGET_SERVICEGROUP = 1,

include/corosync/totem/totempg.h

@@ -153,7 +153,7 @@ extern unsigned int totempg_my_nodeid_get (void);
 
 extern int totempg_my_family_get (void);
 
-extern int totempg_crypto_set (unsigned int type);
+extern int totempg_crypto_set (const char *cipher_type, const char *hash_type);
 
 extern int totempg_ring_reenable (void);