Index: net/test/openssl_helper.cc |
diff --git a/net/test/openssl_helper.cc b/net/test/openssl_helper.cc |
index 25989cb60166607e0f67e01e176df506b0a2e157..f332c67d2df8d92b06cc05441542dbb36f570512 100644 |
--- a/net/test/openssl_helper.cc |
+++ b/net/test/openssl_helper.cc |
@@ -14,7 +14,7 @@ |
static const char kDefaultPEMFile[] = "net/data/ssl/certificates/ok_cert.pem"; |
// Server Name Indication callback from OpenSSL |
-static int sni_cb(SSL *s, int *ad, void *arg) { |
+static int sni_cb(SSL* s, int* ad, void* arg) { |
const char* servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name); |
if (servername && strcmp(servername, "test.example.com") == 0) |
*reinterpret_cast<bool*>(arg) = true; |
@@ -23,31 +23,32 @@ static int sni_cb(SSL *s, int *ad, void *arg) { |
} |
// Client certificate verification callback from OpenSSL |
-static int verify_cb(int preverify_ok, X509_STORE_CTX *ctx) { |
+static int verify_cb(int preverify_ok, X509_STORE_CTX* ctx) { |
return 1; |
} |
// Next Protocol Negotiation callback from OpenSSL |
-static int next_proto_cb(SSL *ssl, const unsigned char **out, |
- unsigned int *outlen, void *arg) { |
+static int next_proto_cb(SSL* ssl, |
+ const unsigned char** out, |
+ unsigned int* outlen, |
+ void* arg) { |
bool* npn_mispredict = reinterpret_cast<bool*>(arg); |
static char kProtos[] = "\003foo\003bar"; |
static char kProtos2[] = "\003baz\003boo"; |
static unsigned count = 0; |
if (!*npn_mispredict || count == 0) { |
- *out = (const unsigned char*) kProtos; |
+ *out = (const unsigned char*)kProtos; |
*outlen = sizeof(kProtos) - 1; |
} else { |
- *out = (const unsigned char*) kProtos2; |
+ *out = (const unsigned char*)kProtos2; |
*outlen = sizeof(kProtos2) - 1; |
} |
count++; |
return SSL_TLSEXT_ERR_OK; |
} |
-int |
-main(int argc, char **argv) { |
+int main(int argc, char** argv) { |
SSL_library_init(); |
ERR_load_crypto_strings(); |
OpenSSL_add_all_algorithms(); |
@@ -132,21 +133,20 @@ main(int argc, char **argv) { |
return 1; |
} |
- EVP_PKEY *pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, NULL); |
+ EVP_PKEY* pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, NULL); |
if (!pkey) { |
fprintf(stderr, "Failed to parse %s\n", key_file); |
return 1; |
} |
BIO_free(key); |
- |
BIO* cert = BIO_new(BIO_s_file()); |
if (BIO_read_filename(cert, cert_file) <= 0) { |
fprintf(stderr, "Failed to read %s\n", cert_file); |
return 1; |
} |
- X509 *pcert = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL); |
+ X509* pcert = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL); |
if (!pcert) { |
fprintf(stderr, "Failed to parse %s\n", cert_file); |
return 1; |
@@ -197,8 +197,8 @@ main(int argc, char **argv) { |
SSL_set_bio(server, bio, bio); |
if (fail_resume) { |
- SSL_set_session_id_context(server, (unsigned char*) &connections, |
- sizeof(connections)); |
+ SSL_set_session_id_context( |
+ server, (unsigned char*)&connections, sizeof(connections)); |
} |
int err; |
@@ -211,8 +211,7 @@ main(int argc, char **argv) { |
if (err == SSL_ERROR_WANT_READ) |
continue; |
if (err == SSL_ERROR_SERVER_RANDOM_VALIDATION_PENDING && snap_start) { |
- SSL_set_suggested_server_random_validity( |
- server, !snap_start_recovery); |
+ SSL_set_suggested_server_random_validity(server, !snap_start_recovery); |
continue; |
} |
ERR_print_errors_fp(stderr); |
@@ -226,14 +225,14 @@ main(int argc, char **argv) { |
} |
if (npn) { |
- const unsigned char *data, *expected_data; |
+ const unsigned char* data, *expected_data; |
unsigned len, expected_len; |
SSL_get0_next_proto_negotiated(server, &data, &len); |
if (!npn_mispredict || connections == 0) { |
- expected_data = (unsigned char*) "foo"; |
+ expected_data = (unsigned char*)"foo"; |
expected_len = 3; |
} else { |
- expected_data = (unsigned char*) "baz"; |
+ expected_data = (unsigned char*)"baz"; |
expected_len = 3; |
} |
if (len != expected_len || memcmp(data, expected_data, len) != 0) { |