Fix LASSO_WSSEC_BAD_PASSWORD error, reformat wsse_username_token.c

 * lasso/errors.h:
   change error id and error name for LASSO_WSSEC_BAD_PASSWORD
 * lasso/xml/ws/wsse_username_token.c:
   update reference to LASSO_WSSEC_BAD_PASSWORD.
   reformat line longer than 100 characters.

2 files changed, 22 insertions, 13 deletions

diff --git a/lasso/errors.h b/lasso/errors.h
index 0629bc00..8e0b8a43 100644
--- a/lasso/errors.h
+++ b/lasso/errors.h
@@ -898,11 +898,11 @@
 #define LASSO_WSSEC_ERROR_MISSING_SECURITY_TOKEN 1600
 
 /**
- * LASSO_WSSE_BAD_PASSWORD:
+ * LASSO_WSSEC_BAD_PASSWORD:
  *
  * The known password does not match the UsernameToken
  */
-#define LASSO_WSSEC_BAD_PASSWORD 1600
+#define LASSO_WSSEC_BAD_PASSWORD 1601
 
 /* ID-WSF 2.0 Discovery Service */
 /**
diff --git a/lasso/xml/ws/wsse_username_token.c b/lasso/xml/ws/wsse_username_token.c
index 9b82ecb1..247c4fc2 100644
--- a/lasso/xml/ws/wsse_username_token.c
+++ b/lasso/xml/ws/wsse_username_token.c
@@ -55,7 +55,8 @@ struct _LassoWsseUsernameTokenPrivate {
 typedef struct _LassoWsseUsernameTokenPrivate LassoWsseUsernameTokenPrivate;
 
 #define LASSO_WSSE_USERNAME_TOKEN_GET_PRIVATE(o) \
-	   (G_TYPE_INSTANCE_GET_PRIVATE ((o), LASSO_TYPE_WSSE_USERNAME_TOKEN, LassoWsseUsernameTokenPrivate))
+	   (G_TYPE_INSTANCE_GET_PRIVATE ((o), LASSO_TYPE_WSSE_USERNAME_TOKEN, \
+					 LassoWsseUsernameTokenPrivate))
 
 static LassoNodeClass *parent_class = NULL;
 
@@ -64,12 +65,18 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoWsseUsernameToken, Id), NULL, LASSO_WSU_PREFIX, LASSO_WSU_HREF},
-	{ "Username", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Username), NULL, NULL, NULL},
-	{ "Nonce", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Nonce), NULL, NULL, NULL},
-	{ "Created", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Created), NULL, NULL, NULL},
-	{ "Salt", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Salt), NULL, LASSO_WSSE11_PREFIX, LASSO_WSSE11_HREF},
-	{ "Iteration", SNIPPET_CONTENT | SNIPPET_INTEGER, G_STRUCT_OFFSET(LassoWsseUsernameToken, Iteration), NULL, LASSO_WSSE11_PREFIX, LASSO_WSSE11_HREF},
+	{ "Id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoWsseUsernameToken, Id), NULL,
+		LASSO_WSU_PREFIX, LASSO_WSU_HREF},
+	{ "Username", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Username), NULL,
+		NULL, NULL},
+	{ "Nonce", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Nonce), NULL, NULL,
+		NULL},
+	{ "Created", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Created), NULL, NULL,
+		NULL},
+	{ "Salt", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsseUsernameToken, Salt), NULL,
+		LASSO_WSSE11_PREFIX, LASSO_WSSE11_HREF},
+	{ "Iteration", SNIPPET_CONTENT | SNIPPET_INTEGER, G_STRUCT_OFFSET(LassoWsseUsernameToken,
+			Iteration), NULL, LASSO_WSSE11_PREFIX, LASSO_WSSE11_HREF},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsseUsernameToken, attributes), NULL, NULL, NULL},
 	{NULL, 0, 0, NULL, NULL, NULL}
@@ -200,7 +207,8 @@ lasso_wsse_username_token_reset_nonce(LassoWsseUsernameToken *wsse_username_toke
  * Set the way to transmit password, that is either cleartext or digest.
  */
 void
-lasso_wsse_username_token_set_password_kind(LassoWsseUsernameToken *wsse_username_token, LassoWsseUsernameTokenPasswordType password_type)
+lasso_wsse_username_token_set_password_kind(LassoWsseUsernameToken *wsse_username_token,
+		LassoWsseUsernameTokenPasswordType password_type)
 {
 	LassoWsseUsernameTokenPrivate *private =
 		LASSO_WSSE_USERNAME_TOKEN_GET_PRIVATE(wsse_username_token);
@@ -209,7 +217,8 @@ lasso_wsse_username_token_set_password_kind(LassoWsseUsernameToken *wsse_usernam
 }
 
 static char *
-_lasso_wsse_username_token_compute_digest(LassoWsseUsernameToken *wsse_username_token, char *password)
+_lasso_wsse_username_token_compute_digest(LassoWsseUsernameToken *wsse_username_token,
+		char *password)
 {
 	guchar *nonce;
 	guint nonce_len = 0;
@@ -285,13 +294,13 @@ lasso_wsse_username_token_check_password(LassoWsseUsernameToken *wsse_username_t
 		case LASSO_WSSE_USERNAME_TOKEN_PASSWORD_TYPE_DIGEST:
 			digest = _lasso_wsse_username_token_compute_digest(wsse_username_token, password);
 			if (strcmp(private->Password, digest) != 0) {
-				rc = LASSO_WSSE_BAD_PASSWORD;
+				rc = LASSO_WSSEC_BAD_PASSWORD;
 			}
 			g_free(digest);
 			break;
 		case LASSO_WSSE_USERNAME_TOKEN_PASSWORD_TYPE_TEXT:
 			if (strcmp(private->Password, password) != 0) {
-				return LASSO_WSSE_BAD_PASSWORD;
+				return LASSO_WSSEC_BAD_PASSWORD;
 			}
 			break;
 		default: