diff --git a/INSTALL b/INSTALL index 4976dba..9baa785 100644 --- a/INSTALL +++ b/INSTALL @@ -15,3 +15,7 @@ Make sure you have libeay32.dll and ssleay32.dll in the current working directory of your application or in your PATH. In your .NET project, add a reference to the ManagedOpenSsl.dll assembly. + + +If you're having trouble with the native library being loaded under mono, +try using MONO_LOG_LEVEL=debug when invoking mono. diff --git a/ManagedOpenSsl/Makefile b/ManagedOpenSsl/Makefile index 11bad09..d234bf4 100644 --- a/ManagedOpenSsl/Makefile +++ b/ManagedOpenSsl/Makefile @@ -12,11 +12,12 @@ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') ifeq ($(uname_S),Darwin) D_OSX = $(TOP)/native/osx -SRC_LIBCRYPTO = $(D_OSX)/libcrypto.0.9.8.dylib -SRC_LIBSSL = $(D_OSX)/libssl.0.9.8.dylib +SRC_LIBCRYPTO = $(D_OSX)/libcrypto.1.0.0.dylib +SRC_LIBSSL = $(D_OSX)/libssl.1.0.0.dylib LIBCRYPTO = $(D_OUT)/libcrypto.dylib LIBSSL = $(D_OUT)/libssl.dylib endif + ifeq ($(uname_S),Linux) D_LINUX = $(TOP)/native/linux/$(uname_M) SRC_LIBCRYPTO = $(D_LINUX)/libcrypto.so.1.0.0 diff --git a/ManagedOpenSsl/ManagedOpenSsl-2010.csproj b/ManagedOpenSsl/ManagedOpenSsl-2010.csproj index 930841c..b69d75e 100644 --- a/ManagedOpenSsl/ManagedOpenSsl-2010.csproj +++ b/ManagedOpenSsl/ManagedOpenSsl-2010.csproj @@ -1,4 +1,4 @@ - + Debug @@ -66,6 +66,8 @@ GlobalSuppressions.cs prompt AllRules.ruleset + 4 + false bin\x64\Release\ @@ -78,6 +80,7 @@ GlobalSuppressions.cs prompt AllRules.ruleset + 4 diff --git a/cli/cli-2010.csproj b/cli/cli-2010.csproj index b06bede..aa633d8 100644 --- a/cli/cli-2010.csproj +++ b/cli/cli-2010.csproj @@ -1,4 +1,4 @@ - + Debug @@ -63,6 +63,8 @@ GlobalSuppressions.cs prompt AllRules.ruleset + 4 + false bin\x64\Release\ @@ -74,6 +76,7 @@ GlobalSuppressions.cs prompt AllRules.ruleset + 4 diff --git a/native/osx/libcrypto.0.9.8.dylib b/native/osx/libcrypto.0.9.8.dylib deleted file mode 100755 index 179680b..0000000 Binary files a/native/osx/libcrypto.0.9.8.dylib and /dev/null differ diff --git a/native/osx/libcrypto.1.0.0.dylib b/native/osx/libcrypto.1.0.0.dylib new file mode 100755 index 0000000..452e55d Binary files /dev/null and b/native/osx/libcrypto.1.0.0.dylib differ diff --git a/native/osx/libssl.0.9.8.dylib b/native/osx/libssl.0.9.8.dylib deleted file mode 100755 index d11f629..0000000 Binary files a/native/osx/libssl.0.9.8.dylib and /dev/null differ diff --git a/native/osx/libssl.1.0.0.dylib b/native/osx/libssl.1.0.0.dylib new file mode 100755 index 0000000..a154a8c Binary files /dev/null and b/native/osx/libssl.1.0.0.dylib differ diff --git a/openssl.net-2010.sln b/openssl.net-2010.sln index 2f3e08d..6e854d3 100644 --- a/openssl.net-2010.sln +++ b/openssl.net-2010.sln @@ -1,3 +1,4 @@ + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{0B96FB71-2BB0-48F8-B3E0-E3848A4F9E87}" @@ -25,22 +26,27 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.Build.0 = Release|Any CPU {73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Debug|Any CPU.Build.0 = Debug|Any CPU {73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Release|Any CPU.ActiveCfg = Release|Any CPU {73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Release|Any CPU.Build.0 = Release|Any CPU - {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.Build.0 = Release|Any CPU {779FA0D7-D7CB-4408-A94D-B5718F118894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {779FA0D7-D7CB-4408-A94D-B5718F118894}.Debug|Any CPU.Build.0 = Debug|Any CPU {779FA0D7-D7CB-4408-A94D-B5718F118894}.Release|Any CPU.ActiveCfg = Release|Any CPU {779FA0D7-D7CB-4408-A94D-B5718F118894}.Release|Any CPU.Build.0 = Release|Any CPU + {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.Build.0 = Release|Any CPU + {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = test\UnitTests\UnitTests-2010.csproj EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/test/UnitTests/.gitignore b/test/UnitTests/.gitignore new file mode 100644 index 0000000..87364a2 --- /dev/null +++ b/test/UnitTests/.gitignore @@ -0,0 +1 @@ +test-results diff --git a/test/UnitTests/Makefile b/test/UnitTests/Makefile index 0633566..a638fd1 100644 --- a/test/UnitTests/Makefile +++ b/test/UnitTests/Makefile @@ -15,9 +15,12 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') ifeq ($(uname_S),Darwin) NUNIT = nunit-console2 $(NUNIT_FLAGS) +NUNIT_PKG = -pkg:mono-nunit +export PKG_CONFIG_PATH = /Library/Frameworks/Mono.framework/Libraries/pkgconfig/ endif ifeq ($(uname_S),Linux) NUNIT = LD_LIBRARY_PATH=. nunit-console $(NUNIT_FLAGS) +NUNIT_PKG = -pkg:nunit endif SRCS = \ @@ -28,7 +31,7 @@ SRCS = \ REFS = \ -r:ManagedOpenSsl.dll \ - -pkg:nunit + $(NUNIT_PKG) $(OUT) : $(SRCS) $(DEPS) $(CSC) $(CSFLAGS) -t:$(TGT_TYPE) -lib:$(LIBPATH) $(REFS) -out:$@ $(SRCS) diff --git a/test/UnitTests/UnitTests-2010.csproj b/test/UnitTests/UnitTests-2010.csproj index c506c3f..15e225a 100644 --- a/test/UnitTests/UnitTests-2010.csproj +++ b/test/UnitTests/UnitTests-2010.csproj @@ -1,4 +1,4 @@ - + Debug @@ -40,8 +40,6 @@ DEBUG;TRACE prompt 4 - Library - UnitTests true x86 AllRules.ruleset @@ -53,9 +51,7 @@ TRACE prompt 4 - Library true - UnitTests true x86 AllRules.ruleset @@ -106,4 +102,7 @@ --> + + + \ No newline at end of file diff --git a/test/test-2010.csproj b/test/test-2010.csproj index 0e6e968..c4f3c6d 100644 --- a/test/test-2010.csproj +++ b/test/test-2010.csproj @@ -1,4 +1,4 @@ - + Debug @@ -65,6 +65,8 @@ false prompt AllRules.ruleset + 4 + false bin\x64\Release\ @@ -76,6 +78,7 @@ GlobalSuppressions.cs prompt AllRules.ruleset + 4