Skip to content

Commit 77e9029

Browse files
committed
merge
2 parents d550706 + 343d426 commit 77e9029

22 files changed

+9769
-7608
lines changed

assets/tagid_names.txt

+817
Large diffs are not rendered by default.

dep/openssl/ManagedOpenSsl.XML

+4,882-4,882
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dep/openssl/ManagedOpenSsl.dll

11.5 KB
Binary file not shown.

dep/openssl/ManagedOpenSsl.dll.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<configuration>
2-
<dllmap os="osx" dll="libeay32" target="libcrypto.1.0.0.dylib"/>
3-
<dllmap os="osx" dll="ssleay32" target="libssl.1.0.0.dylib"/>
4-
<dllmap os="!windows,osx" dll="libeay32" target="libcrypto.so.1.0.0"/>
5-
<dllmap os="!windows,osx" dll="ssleay32" target="libssl.so.1.0.0"/>
6-
</configuration>
1+
<configuration>
2+
<dllmap os="osx" dll="libeay32" target="libcrypto.1.0.0.dylib"/>
3+
<dllmap os="osx" dll="ssleay32" target="libssl.1.0.0.dylib"/>
4+
<dllmap os="!windows,osx" dll="libeay32" target="libcrypto.so"/>
5+
<dllmap os="!windows,osx" dll="ssleay32" target="libssl.so"/>
6+
</configuration>

dep/openssl/ManagedOpenSsl.pdb

432 KB
Binary file not shown.
+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<configuration>
2-
<dllmap os="osx" dll="libeay32" target="libcrypto.dylib"/>
3-
<dllmap os="osx" dll="ssleay32" target="libssl.dylib"/>
4-
<dllmap os="!windows,osx" dll="libeay32" target="libcrypto.so"/>
5-
<dllmap os="!windows,osx" dll="ssleay32" target="libssl.so"/>
6-
</configuration>
1+
<configuration>
2+
<dllmap os="osx" dll="libeay32" target="libcrypto.1.0.0.dylib"/>
3+
<dllmap os="osx" dll="ssleay32" target="libssl.1.0.0.dylib"/>
4+
<dllmap os="!windows,osx" dll="libeay32" target="libcrypto.so"/>
5+
<dllmap os="!windows,osx" dll="ssleay32" target="libssl.so"/>
6+
</configuration>

dep/openssl/src/ManagedOpenSsl/Core/OpenSslException.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public string Message
8585
{
8686
get
8787
{
88-
byte[] buf = new byte[1024];
89-
uint len = Native.ERR_error_string_n(err, buf, buf.Length);
90-
return Encoding.ASCII.GetString(buf, 0, (int)len);
88+
byte[] buf = new byte[1024];
89+
Native.ERR_error_string_n(err, buf, buf.Length);
90+
return Encoding.ASCII.GetString(buf, 0, buf.Length);
9191
}
9292
}
9393
}

0 commit comments

Comments
 (0)