aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-02-19 23:10:10 -0800
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-02-19 23:10:10 -0800
commit2c29920e73ff76cf4cd25cd012efb2c79cc88e50 (patch)
treec73ec53b9d8601fc8ad0833fc93f1dfeb155b91e /src
parent1d435e10ccfe045dba264434cdb2f648631c748d (diff)
Revert "Adding a constant for a well known place where the SSL roots are installed."
Diffstat (limited to 'src')
-rw-r--r--src/core/security/security_context.c5
-rw-r--r--src/core/security/ssl_roots.h40
2 files changed, 0 insertions, 45 deletions
diff --git a/src/core/security/security_context.c b/src/core/security/security_context.c
index e09a569c76..f9fb2407cf 100644
--- a/src/core/security/security_context.c
+++ b/src/core/security/security_context.c
@@ -39,7 +39,6 @@
#include "src/core/channel/http_client_filter.h"
#include "src/core/security/credentials.h"
#include "src/core/security/secure_endpoint.h"
-#include "src/core/security/ssl_roots.h"
#include "src/core/support/env.h"
#include "src/core/support/file.h"
#include "src/core/support/string.h"
@@ -404,10 +403,6 @@ static void init_default_pem_root_certs(void) {
} else {
default_pem_root_certs = gpr_load_file(default_root_certs_path, NULL);
gpr_free(default_root_certs_path);
- if (GPR_SLICE_IS_EMPTY(default_pem_root_certs)) {
- default_pem_root_certs =
- gpr_load_file(GRPC_SSL_ROOTS_WELL_KNOWN_PATH, NULL);
- }
}
}
diff --git a/src/core/security/ssl_roots.h b/src/core/security/ssl_roots.h
deleted file mode 100644
index 49a5e69e01..0000000000
--- a/src/core/security/ssl_roots.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef __GRPC_INTERNAL_SECURITY_SSL_ROOTS_H__
-#define __GRPC_INTERNAL_SECURITY_SSL_ROOTS_H__
-
-/* WARNING: this value is patched at install time. */
-#define GRPC_SSL_ROOTS_WELL_KNOWN_PATH "/etc/grpc/roots.pem"
-
-#endif /* __GRPC_INTERNAL_SECURITY_SSL_ROOTS_H__ */