Merge pull request #665 from nicolasnoble/ssl-prefix

Defining an installation prefix for grpc's root certs at compilation time.
pull/672/head
jboeuf 10 years ago
commit cc07b2d094
  1. 2
      Makefile
  2. 7
      src/core/security/security_context.c
  3. 2
      templates/Makefile.template

@ -163,7 +163,7 @@ HOST_LD = $(LD)
HOST_LDXX = $(LDXX)
CPPFLAGS += $(CPPFLAGS_$(CONFIG))
DEFINES += $(DEFINES_$(CONFIG))
DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\"
LDFLAGS += $(LDFLAGS_$(CONFIG))
CFLAGS += -std=c89 -pedantic

@ -60,6 +60,12 @@
"AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:AES128-" \
"SHA256:AES256-SHA256"
#ifndef INSTALL_PREFIX
static const char *installed_roots_path = "/etc/grpc/roots.pem";
#else
static const char *installed_roots_path = INSTALL_PREFIX "/etc/grpc/roots.pem";
#endif
/* -- Common methods. -- */
grpc_security_status grpc_security_context_create_handshaker(
@ -404,6 +410,7 @@ static void init_default_pem_root_certs(void) {
default_pem_root_certs = gpr_load_file(default_root_certs_path, NULL);
gpr_free(default_root_certs_path);
}
(void) installed_roots_path;
}
size_t grpc_get_default_ssl_roots(const unsigned char **pem_root_certs) {

@ -180,7 +180,7 @@ HOST_LD = $(LD)
HOST_LDXX = $(LDXX)
CPPFLAGS += $(CPPFLAGS_$(CONFIG))
DEFINES += $(DEFINES_$(CONFIG))
DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\"
LDFLAGS += $(LDFLAGS_$(CONFIG))
CFLAGS += -std=c89 -pedantic

Loading…
Cancel
Save