diff options
author | jsing <> | 2014-04-17 13:30:32 +0000 |
---|---|---|
committer | jsing <> | 2014-04-17 13:30:32 +0000 |
commit | ecec66222d758996a4ff2671ca5026d9ede5ef76 (patch) | |
tree | 7c12edcdd4f63b6960ab9fa23b27c41791ce9a1b | |
parent | a115dfee3f0547b4443eb6525ce97316669ab327 (diff) | |
download | openbsd-ecec66222d758996a4ff2671ca5026d9ede5ef76.tar.gz openbsd-ecec66222d758996a4ff2671ca5026d9ede5ef76.tar.bz2 openbsd-ecec66222d758996a4ff2671ca5026d9ede5ef76.zip |
Revert unintended whitespace changes.
-rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/sparcv9cap.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/apps/ca.c | 14 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 8 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/sparcv9cap.c | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 3ccebf77f4..b08226d52b 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
@@ -209,7 +209,7 @@ BIO_get_port(const char *str, unsigned short *port_ptr) | |||
209 | #endif | 209 | #endif |
210 | else { | 210 | else { |
211 | SYSerr(SYS_F_GETSERVBYNAME, errno); | 211 | SYSerr(SYS_F_GETSERVBYNAME, errno); |
212 | ERR_add_error_data(3, "service = '", str, "'"); | 212 | ERR_add_error_data(3, "service='", str, "'"); |
213 | return (0); | 213 | return (0); |
214 | } | 214 | } |
215 | } | 215 | } |
@@ -430,7 +430,7 @@ again: | |||
430 | s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); | 430 | s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); |
431 | if (s == -1) { | 431 | if (s == -1) { |
432 | SYSerr(SYS_F_SOCKET, errno); | 432 | SYSerr(SYS_F_SOCKET, errno); |
433 | ERR_add_error_data(3, "port = '", host, "'"); | 433 | ERR_add_error_data(3, "port='", host, "'"); |
434 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); | 434 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); |
435 | goto err; | 435 | goto err; |
436 | } | 436 | } |
@@ -477,13 +477,13 @@ again: | |||
477 | } | 477 | } |
478 | #endif | 478 | #endif |
479 | SYSerr(SYS_F_BIND, err_num); | 479 | SYSerr(SYS_F_BIND, err_num); |
480 | ERR_add_error_data(3, "port = '", host, "'"); | 480 | ERR_add_error_data(3, "port='", host, "'"); |
481 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_BIND_SOCKET); | 481 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_BIND_SOCKET); |
482 | goto err; | 482 | goto err; |
483 | } | 483 | } |
484 | if (listen(s, MAX_LISTEN) == -1) { | 484 | if (listen(s, MAX_LISTEN) == -1) { |
485 | SYSerr(SYS_F_BIND, errno); | 485 | SYSerr(SYS_F_BIND, errno); |
486 | ERR_add_error_data(3, "port = '", host, "'"); | 486 | ERR_add_error_data(3, "port='", host, "'"); |
487 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_LISTEN_SOCKET); | 487 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_LISTEN_SOCKET); |
488 | goto err; | 488 | goto err; |
489 | } | 489 | } |
diff --git a/src/lib/libcrypto/sparcv9cap.c b/src/lib/libcrypto/sparcv9cap.c index 08f7de3ec8..05c084807a 100644 --- a/src/lib/libcrypto/sparcv9cap.c +++ b/src/lib/libcrypto/sparcv9cap.c | |||
@@ -70,7 +70,7 @@ walk_nodename(di_node_t node, di_node_name_t di_node_name) | |||
70 | char *name = (*di_node_name)(node); | 70 | char *name = (*di_node_name)(node); |
71 | 71 | ||
72 | /* This is expected to catch all UltraSPARC flavors prior T1 */ | 72 | /* This is expected to catch all UltraSPARC flavors prior T1 */ |
73 | if (!strcmp (name, "SUNW, UltraSPARC") || | 73 | if (!strcmp (name, "SUNW,UltraSPARC") || |
74 | !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ | 74 | !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ |
75 | { | 75 | { |
76 | OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1; | 76 | OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1; |
@@ -82,7 +82,7 @@ walk_nodename(di_node_t node, di_node_name_t di_node_name) | |||
82 | return DI_WALK_TERMINATE; | 82 | return DI_WALK_TERMINATE; |
83 | } | 83 | } |
84 | /* This is expected to catch remaining UltraSPARCs, such as T1 */ | 84 | /* This is expected to catch remaining UltraSPARCs, such as T1 */ |
85 | else if (!strncmp(name, "SUNW, UltraSPARC", 15)) { | 85 | else if (!strncmp(name, "SUNW,UltraSPARC", 15)) { |
86 | OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; | 86 | OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; |
87 | 87 | ||
88 | return DI_WALK_TERMINATE; | 88 | return DI_WALK_TERMINATE; |
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c index 50cf81b056..cca54aebce 100644 --- a/src/lib/libssl/src/apps/ca.c +++ b/src/lib/libssl/src/apps/ca.c | |||
@@ -2351,23 +2351,23 @@ get_certificate_status(const char *serial, CA_DB *db) | |||
2351 | ok = -1; | 2351 | ok = -1; |
2352 | goto err; | 2352 | goto err; |
2353 | } else if (rrow[DB_type][0]=='V') { | 2353 | } else if (rrow[DB_type][0]=='V') { |
2354 | BIO_printf(bio_err, "%s = Valid (%c)\n", | 2354 | BIO_printf(bio_err, "%s=Valid (%c)\n", |
2355 | row[DB_serial], rrow[DB_type][0]); | 2355 | row[DB_serial], rrow[DB_type][0]); |
2356 | goto err; | 2356 | goto err; |
2357 | } else if (rrow[DB_type][0]=='R') { | 2357 | } else if (rrow[DB_type][0]=='R') { |
2358 | BIO_printf(bio_err, "%s = Revoked (%c)\n", | 2358 | BIO_printf(bio_err, "%s=Revoked (%c)\n", |
2359 | row[DB_serial], rrow[DB_type][0]); | 2359 | row[DB_serial], rrow[DB_type][0]); |
2360 | goto err; | 2360 | goto err; |
2361 | } else if (rrow[DB_type][0]=='E') { | 2361 | } else if (rrow[DB_type][0]=='E') { |
2362 | BIO_printf(bio_err, "%s = Expired (%c)\n", | 2362 | BIO_printf(bio_err, "%s=Expired (%c)\n", |
2363 | row[DB_serial], rrow[DB_type][0]); | 2363 | row[DB_serial], rrow[DB_type][0]); |
2364 | goto err; | 2364 | goto err; |
2365 | } else if (rrow[DB_type][0]=='S') { | 2365 | } else if (rrow[DB_type][0]=='S') { |
2366 | BIO_printf(bio_err, "%s = Suspended (%c)\n", | 2366 | BIO_printf(bio_err, "%s=Suspended (%c)\n", |
2367 | row[DB_serial], rrow[DB_type][0]); | 2367 | row[DB_serial], rrow[DB_type][0]); |
2368 | goto err; | 2368 | goto err; |
2369 | } else { | 2369 | } else { |
2370 | BIO_printf(bio_err, "%s = Unknown (%c).\n", | 2370 | BIO_printf(bio_err, "%s=Unknown (%c).\n", |
2371 | row[DB_serial], rrow[DB_type][0]); | 2371 | row[DB_serial], rrow[DB_type][0]); |
2372 | ok = -1; | 2372 | ok = -1; |
2373 | } | 2373 | } |
@@ -2421,7 +2421,7 @@ static int do_updatedb (CA_DB *db) | |||
2421 | rrow[DB_type][1] = '\0'; | 2421 | rrow[DB_type][1] = '\0'; |
2422 | cnt++; | 2422 | cnt++; |
2423 | 2423 | ||
2424 | BIO_printf(bio_err, "%s = Expired\n", | 2424 | BIO_printf(bio_err, "%s=Expired\n", |
2425 | rrow[DB_serial]); | 2425 | rrow[DB_serial]); |
2426 | } | 2426 | } |
2427 | } else if (db_y2k < a_y2k) { | 2427 | } else if (db_y2k < a_y2k) { |
@@ -2429,7 +2429,7 @@ static int do_updatedb (CA_DB *db) | |||
2429 | rrow[DB_type][1] = '\0'; | 2429 | rrow[DB_type][1] = '\0'; |
2430 | cnt++; | 2430 | cnt++; |
2431 | 2431 | ||
2432 | BIO_printf(bio_err, "%s = Expired\n", | 2432 | BIO_printf(bio_err, "%s=Expired\n", |
2433 | rrow[DB_serial]); | 2433 | rrow[DB_serial]); |
2434 | } | 2434 | } |
2435 | 2435 | ||
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index 3ccebf77f4..b08226d52b 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
@@ -209,7 +209,7 @@ BIO_get_port(const char *str, unsigned short *port_ptr) | |||
209 | #endif | 209 | #endif |
210 | else { | 210 | else { |
211 | SYSerr(SYS_F_GETSERVBYNAME, errno); | 211 | SYSerr(SYS_F_GETSERVBYNAME, errno); |
212 | ERR_add_error_data(3, "service = '", str, "'"); | 212 | ERR_add_error_data(3, "service='", str, "'"); |
213 | return (0); | 213 | return (0); |
214 | } | 214 | } |
215 | } | 215 | } |
@@ -430,7 +430,7 @@ again: | |||
430 | s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); | 430 | s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); |
431 | if (s == -1) { | 431 | if (s == -1) { |
432 | SYSerr(SYS_F_SOCKET, errno); | 432 | SYSerr(SYS_F_SOCKET, errno); |
433 | ERR_add_error_data(3, "port = '", host, "'"); | 433 | ERR_add_error_data(3, "port='", host, "'"); |
434 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); | 434 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); |
435 | goto err; | 435 | goto err; |
436 | } | 436 | } |
@@ -477,13 +477,13 @@ again: | |||
477 | } | 477 | } |
478 | #endif | 478 | #endif |
479 | SYSerr(SYS_F_BIND, err_num); | 479 | SYSerr(SYS_F_BIND, err_num); |
480 | ERR_add_error_data(3, "port = '", host, "'"); | 480 | ERR_add_error_data(3, "port='", host, "'"); |
481 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_BIND_SOCKET); | 481 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_BIND_SOCKET); |
482 | goto err; | 482 | goto err; |
483 | } | 483 | } |
484 | if (listen(s, MAX_LISTEN) == -1) { | 484 | if (listen(s, MAX_LISTEN) == -1) { |
485 | SYSerr(SYS_F_BIND, errno); | 485 | SYSerr(SYS_F_BIND, errno); |
486 | ERR_add_error_data(3, "port = '", host, "'"); | 486 | ERR_add_error_data(3, "port='", host, "'"); |
487 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_LISTEN_SOCKET); | 487 | BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_LISTEN_SOCKET); |
488 | goto err; | 488 | goto err; |
489 | } | 489 | } |
diff --git a/src/lib/libssl/src/crypto/sparcv9cap.c b/src/lib/libssl/src/crypto/sparcv9cap.c index 08f7de3ec8..05c084807a 100644 --- a/src/lib/libssl/src/crypto/sparcv9cap.c +++ b/src/lib/libssl/src/crypto/sparcv9cap.c | |||
@@ -70,7 +70,7 @@ walk_nodename(di_node_t node, di_node_name_t di_node_name) | |||
70 | char *name = (*di_node_name)(node); | 70 | char *name = (*di_node_name)(node); |
71 | 71 | ||
72 | /* This is expected to catch all UltraSPARC flavors prior T1 */ | 72 | /* This is expected to catch all UltraSPARC flavors prior T1 */ |
73 | if (!strcmp (name, "SUNW, UltraSPARC") || | 73 | if (!strcmp (name, "SUNW,UltraSPARC") || |
74 | !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ | 74 | !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ |
75 | { | 75 | { |
76 | OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1; | 76 | OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1; |
@@ -82,7 +82,7 @@ walk_nodename(di_node_t node, di_node_name_t di_node_name) | |||
82 | return DI_WALK_TERMINATE; | 82 | return DI_WALK_TERMINATE; |
83 | } | 83 | } |
84 | /* This is expected to catch remaining UltraSPARCs, such as T1 */ | 84 | /* This is expected to catch remaining UltraSPARCs, such as T1 */ |
85 | else if (!strncmp(name, "SUNW, UltraSPARC", 15)) { | 85 | else if (!strncmp(name, "SUNW,UltraSPARC", 15)) { |
86 | OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; | 86 | OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; |
87 | 87 | ||
88 | return DI_WALK_TERMINATE; | 88 | return DI_WALK_TERMINATE; |