Skip to content
Permalink
Browse files
8273646: Add openssl from path variable also in to Default System Ope…
…nssl Path in OpensslArtifactFetcher

Reviewed-by: weijun
  • Loading branch information
thejasviv authored and Abdul Kolarkunnu committed Sep 21, 2021
1 parent 65ed0a7 commit a5108a605e6a1e427d90dbeeb8630a3d01d6b405
Showing with 2 additions and 2 deletions.
  1. +2 −2 test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
@@ -82,8 +82,8 @@ private static String getOpensslFromSystemProp(String version) {
}

private static String getDefaultSystemOpensslPath(String version) {
if (verifyOpensslVersion("/usr/bin/openssl", version)) {
return "/usr/bin/openssl";
if (verifyOpensslVersion("openssl", version)) {
return "openssl";
} else if (verifyOpensslVersion("/usr/local/bin/openssl", version)) {
return "/usr/local/bin/openssl";
}

3 comments on commit a5108a6

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot replied Sep 21, 2021

@GoeLin

This comment has been minimized.

Copy link
Member

@GoeLin GoeLin replied Oct 9, 2021

/backport jdk11u-dev

@openjdk

This comment has been minimized.

Copy link

@openjdk openjdk bot replied Oct 9, 2021

@GoeLin @GoeLin the backport was successfully created on the branch GoeLin-backport-a5108a60 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit a5108a60 from the openjdk/jdk repository.

The commit being backported was authored by Thejasvi Voniadka on 21 Sep 2021 and was reviewed by Weijun Wang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-a5108a60:GoeLin-backport-a5108a60
$ git checkout GoeLin-backport-a5108a60
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-a5108a60
Please sign in to comment.