Skip to content
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

Enable thread safety in static OpenSSL build #598

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Enable thread safety in static OpenSSL build #598

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions Rakefile.cross
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ class CrossLibrary < OpenStruct
self.cmd_prelude = [
"env",
"CROSS_COMPILE=#{host_platform}-",
"CFLAGS=-DDSO_WIN32",
"CFLAGS=-DDSO_WIN32 -DOPENSSL_THREADS",
]


# generate the makefile in a clean build location
file openssl_makefile => static_openssl_builddir do |t|
chdir( static_openssl_builddir ) do
cmd = cmd_prelude.dup
cmd << "./Configure" << "-static" << openssl_config
cmd << "./Configure" << "threads" << "-static" << openssl_config

run( *cmd )
end
Expand Down Expand Up @@ -192,7 +192,7 @@ class CrossLibrary < OpenStruct
cmd << "CFLAGS=-L#{static_openssl_builddir}"
cmd << "LDFLAGS=-L#{static_openssl_builddir}"
cmd << "LDFLAGS_SL=-L#{static_openssl_builddir}"
cmd << "LIBS=-lwsock32 -lgdi32 -lws2_32 -lcrypt32"
cmd << "LIBS=-lssl -lwsock32 -lgdi32 -lws2_32 -lcrypt32"
cmd << "CPPFLAGS=-I#{static_openssl_builddir}/include"

run( *cmd )
Expand Down
11 changes: 11 additions & 0 deletions spec/pg/connection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,6 +1556,17 @@
end
end

it "can connect concurrently in parallel threads", :postgresql_95 do
res = 5.times.map do |idx|
Thread.new do
PG.connect(@conninfo) do |conn|
[conn.ssl_in_use?, conn.exec("select 82").getvalue(0, 0)]
end
end
end.map(&:value)
expect( res ).to eq( [[true, "82"]] * 5 )
end

describe "deprecated password encryption method" do
it "can encrypt password for a given user" do
expect( described_class.encrypt_password("postgres", "postgres") ).to match( /\S+/ )
Expand Down
Loading