honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12102 from rmuir/bouncy 

Allow use of bouncycastle
This commit is contained in:
Robert Muir 2015-07-07 18:15:48 -04:00
parent 27b8e59c24 46c89f006d
commit 26f544ff94
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/elasticsearch/bootstrap/Security.java
View File

@ -80,6 +80,7 @@ final class Security {
m.put(Pattern.compile(".*lucene-core-.*\\.jar$"), "es.security.jar.lucene.core");
m.put(Pattern.compile(".*jsr166e-.*\\.jar$"), "es.security.jar.twitter.jsr166e");
m.put(Pattern.compile(".*securemock-.*\\.jar$"), "es.security.jar.elasticsearch.securemock");
m.put(Pattern.compile(".*bcprov-.*\\.jar$"), "es.security.jar.bouncycastle.bcprov");
SPECIAL_JARS = Collections.unmodifiableMap(m);
}

5
core/src/main/resources/org/elasticsearch/bootstrap/security.policy
View File

@ -47,6 +47,11 @@ grant codeBase "${es.security.jar.elasticsearch.securemock}" {
permission java.lang.RuntimePermission "reflectionFactoryAccess";
};
grant codeBase "${es.security.jar.bouncycastle.bcprov}" {
// needed to allow installation of bouncycastle crypto provider
permission java.security.SecurityPermission "putProviderProperty.BC";
};
//// Everything else:
grant {