Skip to content

Added simple lib detection #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lilianne-Blaze wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added simple lib detection #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/main/java/com/muquit/libsodiumjna/SodiumLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
import com.sun.jna.Library;
import com.sun.jna.Native;
import com.sun.jna.NativeLong;
import com.sun.jna.Platform;
import com.sun.jna.Pointer;
import java.nio.file.Files;
import java.nio.file.Paths;

/**
* SodiumLibrary is a Java binding to <a href="https://download.libsodium.org/doc/" target="_blank">libsodium</a> crypto C APIs
Expand Down Expand Up @@ -114,6 +117,14 @@ public static Sodium sodium()
{
if (SodiumLibrary.libPath == null)
{
logger.debug("libpath not set, trying to find lib");
tryFindLib();
if( SodiumLibrary.libPath == null)
{
logger.info("libpath not set, throw exception");
throw new RuntimeException("Please set the absolute path of the libsodium libary by calling SodiumLibrary.setLibraryPath(path)");
}

logger.info("libpath not set, throw exception");
throw new RuntimeException("Please set the absolute path of the libsodium libary by calling SodiumLibrary.setLibraryPath(path)");
}
Expand All @@ -132,6 +143,25 @@ public static Sodium sodium()
return sodium;
}

private static void tryFindLib() {
if (Platform.isWindows()) {
// use env var, as it's possible we're running in Windows PE with X:\Windows
String s1 = System.getenv("SystemRoot") + "\\System32\\libsodium.dll";
if (Files.isReadable(Paths.get(s1))) {
SodiumLibrary.libPath = s1;
logger.debug("found {}",s1);
return;
}
}

String s2 = "./libsodium.dll";
if (Files.isReadable(Paths.get(s2))) {
SodiumLibrary.libPath = s2;
logger.debug("found {}",s2);
return;
}
}

private static final class SingletonHelper
{
public static final Sodium instance = (Sodium) Native.loadLibrary(libPath,Sodium.class);
Expand Down