apps/srp.c: make it indent-friendly.

diff --git a/apps/srp.c b/apps/srp.c
index 9c7ae184db1627efcf6f4b0cd1b4849d118cb557..a9f20833a768f7a7d4e8d1d0a02028417580b552 100644 (file)
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -222,10 +222,17 @@ static char *srp_verify_user(const char *user, const char *srp_verifier,
 
        if (password_callback(password, 1024, 0, &cb_tmp) >0)
                {
-               VERBOSE BIO_printf(bio,"Validating\n   user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",user,srp_verifier,srp_usersalt, g, N);
+               VERBOSE BIO_printf(bio,
+                               "Validating\n"
+                               " user=\"%s\"\n"
+                               " srp_verifier=\"%s\"\n"
+                               " srp_usersalt=\"%s\"\n"
+                               " g=\"%s\"\n N=\"%s\"\n",
+                               user,srp_verifier,srp_usersalt, g, N);
                BIO_printf(bio, "Pass %s\n", password);
 
-               if (!(gNid=SRP_create_verifier(user, password, &srp_usersalt, &verifier, N, g)))
+               if (!(gNid=SRP_create_verifier(user, password, &srp_usersalt,
+                                               &verifier, N, g)))
                        {
                        BIO_printf(bio, "Internal error validating SRP verifier\n");
                        }
@@ -252,8 +259,13 @@ static char *srp_create_user(char *user, char **srp_verifier,
 
        if (password_callback(password,1024,1,&cb_tmp) >0)
                {
-               VERBOSE BIO_printf(bio,"Creating\n user=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",user,g,N);
-               if (!(gNid =SRP_create_verifier(user, password, &salt, srp_verifier, N, g)))
+               VERBOSE BIO_printf(bio,
+                               "Creating\n"
+                               " user=\"%s\"\n"
+                               " g=\"%s\"\n"
+                               " N=\"%s\"\n",user,g,N);
+               if (!(gNid =SRP_create_verifier(user, password, &salt,
+                                               srp_verifier, N, g)))
                        {
                        BIO_printf(bio,"Internal error creating SRP verifier\n");
                        }
@@ -393,12 +405,14 @@ bad:
                }
        if (add_user+delete_user+modify_user+list_user != 1)
                {
-               BIO_printf(bio_err,"Exactly one of the options -add, -delete, -modify -list must be specified.\n");
+               BIO_printf(bio_err,"Exactly one of the options "
+                       "-add, -delete, -modify -list must be specified.\n");
                badops = 1;
                }
        if (delete_user+modify_user+delete_user== 1 && argc <= 0)
                {
-               BIO_printf(bio_err,"Need at least one user for options -add, -delete, -modify. \n");
+               BIO_printf(bio_err,"Need at least one user for options "
+                               "-add, -delete, -modify. \n");
                badops = 1;
                }
        if ((passin || passout) && argc != 1 )
@@ -599,9 +613,14 @@ bad:
                                row[DB_srpverifier] = NULL;
                                row[DB_srpsalt] = NULL;
                                row[DB_srpinfo] = NULL;
-                               if (!(gNid = srp_create_user(user,&(row[DB_srpverifier]), &(row[DB_srpsalt]),gNrow?gNrow[DB_srpsalt]:gN,gNrow?gNrow[DB_srpverifier]:NULL, passout, bio_err,verbose)))
+                               if (!(gNid = srp_create_user(user,&(row[DB_srpverifier]),
+                                                       &(row[DB_srpsalt]),
+                                                       gNrow?gNrow[DB_srpsalt]:gN,
+                                                       gNrow?gNrow[DB_srpverifier]:NULL,
+                                                       passout, bio_err,verbose)))
                                        {
-                                               BIO_printf(bio_err, "Cannot create srp verifier for user \"%s\", operation abandoned .\n", user);
+                                               BIO_printf(bio_err, "Cannot create srp verifier for user \"%s\","
+                                                               " operation abandoned .\n", user);
                                                errors++;
                                                goto err;
                                        }
@@ -609,8 +628,9 @@ bad:
                                row[DB_srptype] = BUF_strdup("v");
                                row[DB_srpgN] = BUF_strdup(gNid);
 
-                               if (!row[DB_srpid] || !row[DB_srpgN] || !row[DB_srptype] || !row[DB_srpverifier] || !row[DB_srpsalt] ||
-                                       (userinfo && (!(row[DB_srpinfo] = BUF_strdup(userinfo)))) || 
+                               if (!row[DB_srpid] || !row[DB_srpgN] || !row[DB_srptype]
+                                   || !row[DB_srpverifier] || !row[DB_srpsalt]
+                                   || (userinfo && (!(row[DB_srpinfo] = BUF_strdup(userinfo)))) || 
                                        !update_index(db, bio_err, row))
                                        {
                                        if (row[DB_srpid]) OPENSSL_free(row[DB_srpid]);
@@ -662,9 +682,14 @@ bad:
                                                } 
                                        VERBOSE BIO_printf(bio_err,"Password for user \"%s\" ok.\n",user);
 
-                                       if (!(gNid=srp_create_user(user,&(row[DB_srpverifier]), &(row[DB_srpsalt]),gNrow?gNrow[DB_srpsalt]:NULL, gNrow?gNrow[DB_srpverifier]:NULL, passout, bio_err,verbose)))
+                                       if (!(gNid=srp_create_user(user,&(row[DB_srpverifier]),
+                                                               &(row[DB_srpsalt]),
+                                                               gNrow?gNrow[DB_srpsalt]:NULL,
+                                                               gNrow?gNrow[DB_srpverifier]:NULL,
+                                                               passout, bio_err,verbose)))
                                                {
-                                               BIO_printf(bio_err, "Cannot create srp verifier for user \"%s\", operation abandoned.\n", user);
+                                               BIO_printf(bio_err, "Cannot create srp verifier for user \"%s\","
+                                                               " operation abandoned.\n", user);
                                                errors++;
                                                goto err;
                                                }