Sanity fixes

pull/10342/head
Craig Tiller 8 years ago
parent b29f1fe3a2
commit 730ddc2758
  1. 2
      src/core/lib/transport/bdp_estimator.h
  2. 6
      src/core/tsi/fake_transport_security.h
  3. 6
      src/core/tsi/ssl_transport_security.h
  4. 6
      src/core/tsi/ssl_types.h
  5. 6
      src/core/tsi/transport_security.h
  6. 6
      src/core/tsi/transport_security_interface.h
  7. 8
      test/core/bad_ssl/servers/cert.c

@ -73,4 +73,4 @@ void grpc_bdp_estimator_start_ping(grpc_bdp_estimator *estimator);
// Completes a previously started ping
void grpc_bdp_estimator_complete_ping(grpc_bdp_estimator *estimator);
#endif
#endif /* GRPC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H */

@ -31,8 +31,8 @@
*
*/
#ifndef GRPC_CORE_LIB_TSI_FAKE_TRANSPORT_SECURITY_H
#define GRPC_CORE_LIB_TSI_FAKE_TRANSPORT_SECURITY_H
#ifndef GRPC_CORE_TSI_FAKE_TRANSPORT_SECURITY_H
#define GRPC_CORE_TSI_FAKE_TRANSPORT_SECURITY_H
#include "src/core/tsi/transport_security_interface.h"
@ -58,4 +58,4 @@ tsi_frame_protector *tsi_create_fake_protector(
}
#endif
#endif /* GRPC_CORE_LIB_TSI_FAKE_TRANSPORT_SECURITY_H */
#endif /* GRPC_CORE_TSI_FAKE_TRANSPORT_SECURITY_H */

@ -31,8 +31,8 @@
*
*/
#ifndef GRPC_CORE_LIB_TSI_SSL_TRANSPORT_SECURITY_H
#define GRPC_CORE_LIB_TSI_SSL_TRANSPORT_SECURITY_H
#ifndef GRPC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
#define GRPC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
#include "src/core/tsi/transport_security_interface.h"
@ -188,4 +188,4 @@ int tsi_ssl_peer_matches_name(const tsi_peer *peer, const char *name);
}
#endif
#endif /* GRPC_CORE_LIB_TSI_SSL_TRANSPORT_SECURITY_H */
#endif /* GRPC_CORE_TSI_SSL_TRANSPORT_SECURITY_H */

@ -31,8 +31,8 @@
*
*/
#ifndef GRPC_CORE_LIB_TSI_SSL_TYPES_H
#define GRPC_CORE_LIB_TSI_SSL_TYPES_H
#ifndef GRPC_CORE_TSI_SSL_TYPES_H
#define GRPC_CORE_TSI_SSL_TYPES_H
/* A collection of macros to cast between various integer types that are
* used differently between BoringSSL and OpenSSL:
@ -52,4 +52,4 @@
#define TSI_SIZE_AS_SIZE(x) ((int)(x))
#endif
#endif /* GRPC_CORE_LIB_TSI_SSL_TYPES_H */
#endif /* GRPC_CORE_TSI_SSL_TYPES_H */

@ -31,8 +31,8 @@
*
*/
#ifndef GRPC_CORE_LIB_TSI_TRANSPORT_SECURITY_H
#define GRPC_CORE_LIB_TSI_TRANSPORT_SECURITY_H
#ifndef GRPC_CORE_TSI_TRANSPORT_SECURITY_H
#define GRPC_CORE_TSI_TRANSPORT_SECURITY_H
#include "src/core/tsi/transport_security_interface.h"
@ -108,4 +108,4 @@ char *tsi_strdup(const char *src); /* Sadly, no strdup in C89. */
}
#endif
#endif /* GRPC_CORE_LIB_TSI_TRANSPORT_SECURITY_H */
#endif /* GRPC_CORE_TSI_TRANSPORT_SECURITY_H */

@ -31,8 +31,8 @@
*
*/
#ifndef GRPC_CORE_LIB_TSI_TRANSPORT_SECURITY_INTERFACE_H
#define GRPC_CORE_LIB_TSI_TRANSPORT_SECURITY_INTERFACE_H
#ifndef GRPC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H
#define GRPC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H
#include <stdint.h>
#include <stdlib.h>
@ -350,4 +350,4 @@ void tsi_handshaker_destroy(tsi_handshaker *self);
}
#endif
#endif /* GRPC_CORE_LIB_TSI_TRANSPORT_SECURITY_INTERFACE_H */
#endif /* GRPC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H */

@ -56,11 +56,11 @@ int main(int argc, char **argv) {
grpc_init();
GPR_ASSERT(GRPC_LOG_IF_ERROR(
"load_file", grpc_load_file("src/core/tsi/test_creds/badserver.pem",
1, &cert_slice)));
"load_file",
grpc_load_file("src/core/tsi/test_creds/badserver.pem", 1, &cert_slice)));
GPR_ASSERT(GRPC_LOG_IF_ERROR(
"load_file", grpc_load_file("src/core/tsi/test_creds/badserver.key",
1, &key_slice)));
"load_file",
grpc_load_file("src/core/tsi/test_creds/badserver.key", 1, &key_slice)));
pem_key_cert_pair.private_key = (const char *)GRPC_SLICE_START_PTR(key_slice);
pem_key_cert_pair.cert_chain = (const char *)GRPC_SLICE_START_PTR(cert_slice);

Loading…
Cancel
Save