From 4ec6072326fd06c64514abcbb7166249004ee364 Mon Sep 17 00:00:00 2001 From: jsing Date: Thu, 17 Apr 2014 13:29:21 +0000 Subject: [PATCH] Revert unintended whitespace changes. --- lib/libcrypto/bio/b_sock.c | 8 ++++---- lib/libcrypto/sparcv9cap.c | 4 ++-- lib/libssl/src/apps/ca.c | 14 +++++++------- lib/libssl/src/crypto/bio/b_sock.c | 8 ++++---- lib/libssl/src/crypto/sparcv9cap.c | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c index 3ccebf77f43..b08226d52ba 100644 --- a/lib/libcrypto/bio/b_sock.c +++ b/lib/libcrypto/bio/b_sock.c @@ -209,7 +209,7 @@ BIO_get_port(const char *str, unsigned short *port_ptr) #endif else { SYSerr(SYS_F_GETSERVBYNAME, errno); - ERR_add_error_data(3, "service = '", str, "'"); + ERR_add_error_data(3, "service='", str, "'"); return (0); } } @@ -430,7 +430,7 @@ again: s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); if (s == -1) { SYSerr(SYS_F_SOCKET, errno); - ERR_add_error_data(3, "port = '", host, "'"); + ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); goto err; } @@ -477,13 +477,13 @@ again: } #endif SYSerr(SYS_F_BIND, err_num); - ERR_add_error_data(3, "port = '", host, "'"); + ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_BIND_SOCKET); goto err; } if (listen(s, MAX_LISTEN) == -1) { SYSerr(SYS_F_BIND, errno); - ERR_add_error_data(3, "port = '", host, "'"); + ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_LISTEN_SOCKET); goto err; } diff --git a/lib/libcrypto/sparcv9cap.c b/lib/libcrypto/sparcv9cap.c index 08f7de3ec8a..05c084807a5 100644 --- a/lib/libcrypto/sparcv9cap.c +++ b/lib/libcrypto/sparcv9cap.c @@ -70,7 +70,7 @@ walk_nodename(di_node_t node, di_node_name_t di_node_name) char *name = (*di_node_name)(node); /* This is expected to catch all UltraSPARC flavors prior T1 */ - if (!strcmp (name, "SUNW, UltraSPARC") || + if (!strcmp (name, "SUNW,UltraSPARC") || !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ { 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) return DI_WALK_TERMINATE; } /* This is expected to catch remaining UltraSPARCs, such as T1 */ - else if (!strncmp(name, "SUNW, UltraSPARC", 15)) { + else if (!strncmp(name, "SUNW,UltraSPARC", 15)) { OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; return DI_WALK_TERMINATE; diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c index 50cf81b0564..cca54aebce7 100644 --- a/lib/libssl/src/apps/ca.c +++ b/lib/libssl/src/apps/ca.c @@ -2351,23 +2351,23 @@ get_certificate_status(const char *serial, CA_DB *db) ok = -1; goto err; } else if (rrow[DB_type][0]=='V') { - BIO_printf(bio_err, "%s = Valid (%c)\n", + BIO_printf(bio_err, "%s=Valid (%c)\n", row[DB_serial], rrow[DB_type][0]); goto err; } else if (rrow[DB_type][0]=='R') { - BIO_printf(bio_err, "%s = Revoked (%c)\n", + BIO_printf(bio_err, "%s=Revoked (%c)\n", row[DB_serial], rrow[DB_type][0]); goto err; } else if (rrow[DB_type][0]=='E') { - BIO_printf(bio_err, "%s = Expired (%c)\n", + BIO_printf(bio_err, "%s=Expired (%c)\n", row[DB_serial], rrow[DB_type][0]); goto err; } else if (rrow[DB_type][0]=='S') { - BIO_printf(bio_err, "%s = Suspended (%c)\n", + BIO_printf(bio_err, "%s=Suspended (%c)\n", row[DB_serial], rrow[DB_type][0]); goto err; } else { - BIO_printf(bio_err, "%s = Unknown (%c).\n", + BIO_printf(bio_err, "%s=Unknown (%c).\n", row[DB_serial], rrow[DB_type][0]); ok = -1; } @@ -2421,7 +2421,7 @@ static int do_updatedb (CA_DB *db) rrow[DB_type][1] = '\0'; cnt++; - BIO_printf(bio_err, "%s = Expired\n", + BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]); } } else if (db_y2k < a_y2k) { @@ -2429,7 +2429,7 @@ static int do_updatedb (CA_DB *db) rrow[DB_type][1] = '\0'; cnt++; - BIO_printf(bio_err, "%s = Expired\n", + BIO_printf(bio_err, "%s=Expired\n", rrow[DB_serial]); } diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c index 3ccebf77f43..b08226d52ba 100644 --- a/lib/libssl/src/crypto/bio/b_sock.c +++ b/lib/libssl/src/crypto/bio/b_sock.c @@ -209,7 +209,7 @@ BIO_get_port(const char *str, unsigned short *port_ptr) #endif else { SYSerr(SYS_F_GETSERVBYNAME, errno); - ERR_add_error_data(3, "service = '", str, "'"); + ERR_add_error_data(3, "service='", str, "'"); return (0); } } @@ -430,7 +430,7 @@ again: s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); if (s == -1) { SYSerr(SYS_F_SOCKET, errno); - ERR_add_error_data(3, "port = '", host, "'"); + ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); goto err; } @@ -477,13 +477,13 @@ again: } #endif SYSerr(SYS_F_BIND, err_num); - ERR_add_error_data(3, "port = '", host, "'"); + ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_BIND_SOCKET); goto err; } if (listen(s, MAX_LISTEN) == -1) { SYSerr(SYS_F_BIND, errno); - ERR_add_error_data(3, "port = '", host, "'"); + ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_LISTEN_SOCKET); goto err; } diff --git a/lib/libssl/src/crypto/sparcv9cap.c b/lib/libssl/src/crypto/sparcv9cap.c index 08f7de3ec8a..05c084807a5 100644 --- a/lib/libssl/src/crypto/sparcv9cap.c +++ b/lib/libssl/src/crypto/sparcv9cap.c @@ -70,7 +70,7 @@ walk_nodename(di_node_t node, di_node_name_t di_node_name) char *name = (*di_node_name)(node); /* This is expected to catch all UltraSPARC flavors prior T1 */ - if (!strcmp (name, "SUNW, UltraSPARC") || + if (!strcmp (name, "SUNW,UltraSPARC") || !strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */ { 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) return DI_WALK_TERMINATE; } /* This is expected to catch remaining UltraSPARCs, such as T1 */ - else if (!strncmp(name, "SUNW, UltraSPARC", 15)) { + else if (!strncmp(name, "SUNW,UltraSPARC", 15)) { OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; return DI_WALK_TERMINATE; -- 2.20.1