VOL-4151: Code improvement to use static const instead of static
to allow for compiler optimization.
Also fixed SECURITY.md document as the sample commands were not
ready for copy/paste earlier.
Change-Id: I7fdfa03ed3e6677466fb78b8ea8532d4f5c0a6da
diff --git a/SECURITY.md b/SECURITY.md
index a7827d3..a64cb0c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -43,7 +43,7 @@
Note that the gRPC clients may require these certificates.
First create the **keystore** directory, if it is not created already.
-A few definitions will be useful, here domain is the ma1 IP address of the OLT.
+A few definitions will be useful, here domain is the ma1 IP address of the OLT which is "192.168.31.251".
```
## on the test OLT
@@ -68,8 +68,8 @@
........................................+++
..................................+++
e is 65537 (0x10001)
-root@EC2047000518:~/keystore2#
-root@EC2047000518:~/keystore2# openssl req -x509 -new -nodes -key root.key -sha256 -days $NUM_OF_DAYS -out root.crt
+
+# openssl req -x509 -new -nodes -key root.key -sha256 -days $NUM_OF_DAYS -out root.crt
You are about to be asked to enter information that will be incorporated
into your certificate request.
What you are about to enter is what is called a Distinguished Name or a DN.
@@ -89,15 +89,15 @@
```
# cat << EOF > v3.ext
-> authorityKeyIdentifier=keyid,issuer
-> basicConstraints=CA:FALSE
-> keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-> subjectAltName = @alt_names
->
-> [alt_names]
-> DNS.1 = $DOMAIN
-> IP.1 = $COMMON_NAME
-> EOF
+authorityKeyIdentifier=keyid,issuer
+basicConstraints=CA:FALSE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = $DOMAIN
+IP.1 = $COMMON_NAME
+EOF
# cat v3.ext
authorityKeyIdentifier=keyid,issuer
diff --git a/VERSION b/VERSION
index 1545d96..c1aee2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0
+3.5.1-dev
diff --git a/agent/src/core_utils.cc b/agent/src/core_utils.cc
index a80b8d6..2aad9fd 100644
--- a/agent/src/core_utils.cc
+++ b/agent/src/core_utils.cc
@@ -1844,7 +1844,7 @@
}
std::pair<grpc_ssl_client_certificate_request_type, bool> get_grpc_tls_option(const char* tls_option) {
- static std::map<std::string,grpc_ssl_client_certificate_request_type> grpc_security_option_map = {{"GRPC_SSL_DONT_REQUEST_CLIENT_CERTIFICATE",
+ static const std::map<std::string,grpc_ssl_client_certificate_request_type> grpc_security_option_map = {{"GRPC_SSL_DONT_REQUEST_CLIENT_CERTIFICATE",
grpc_ssl_client_certificate_request_type::GRPC_SSL_DONT_REQUEST_CLIENT_CERTIFICATE},
{"GRPC_SSL_REQUEST_CLIENT_CERTIFICATE_BUT_DONT_VERIFY",
grpc_ssl_client_certificate_request_type::GRPC_SSL_REQUEST_CLIENT_CERTIFICATE_BUT_DONT_VERIFY},