Commitf03bd57

committed

Use existing SSL certs in LDAP tests instead of generating them

The SSL test suite has a bunch of pre-existing certificates, so it'sbetter simply to use what we already have than generate new certificateseach time the LDAP tests are run.Discussion:https://postgr.es/m/bc305c7a-f390-44f2-2e82-9bcaec6108da@dunslane.net

1 parent8284cf5 commitf03bd57Copy full SHA for f03bd57

File tree

+13

-13

lines changed

+13

-13

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ top_builddir = ../../..`
`14`	`14`	`include$(top_builddir)/src/Makefile.global`
`15`	`15`
`16`	`16`	`exportwith_ldap`
`17`		`-exportOPENSSL`
`18`	`17`
`19`	`18`	`check:`
`20`	`19`	`$(prove_check)`

Lines changed: 0 additions & 1 deletion

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`use strict;`
`5`	`5`	`use warnings;`
	`6`	`+use File::Copy;`
`6`	`7`	`use PostgreSQL::Test::Utils;`
`7`	`8`	`use PostgreSQL::Test::Cluster;`
`8`	`9`	`use Test::More;`
`@@ -113,17 +114,13 @@`
`113`	`114`	`mkdir$ldap_datadirordie;`
`114`	`115`	`mkdir$slapd_certsordie;`
`115`	`116`
`116`		`-my$openssl =$ENV{OPENSSL};`
`117`		`-`
`118`		`-system_or_bail$openssl,"req","-new","-nodes","-keyout",`
`119`		`-"$slapd_certs/ca.key","-x509","-out","$slapd_certs/ca.crt","-subj",`
`120`		`-"/CN=CA";`
`121`		`-system_or_bail$openssl,"req","-new","-nodes","-keyout",`
`122`		`-"$slapd_certs/server.key","-out","$slapd_certs/server.csr","-subj",`
`123`		`-"/CN=server";`
`124`		`-system_or_bail$openssl,"x509","-req","-in","$slapd_certs/server.csr",`
`125`		`-"-CA","$slapd_certs/ca.crt","-CAkey","$slapd_certs/ca.key",`
`126`		`-"-CAcreateserial","-out","$slapd_certs/server.crt";`
	`117`	`+# use existing certs from nearby SSL test suite`
	`118`	`+copy"../ssl/ssl/server_ca.crt","$slapd_certs/ca.crt"`
	`119`	`+ \|\|die"copying ca.crt:$!";`
	`120`	`+copy"../ssl/ssl/server-cn-only.crt","$slapd_certs/server.crt"`
	`121`	`+ \|\|die"copying server.crt:$!";;`
	`122`	`+copy"../ssl/ssl/server-cn-only.key","$slapd_certs/server.key"`
	`123`	`+ \|\|die"copying server.key:$!";;`
`127`	`124`
`128`	`125`	`system_or_bail$slapd,'-f',$slapd_conf,'-h',"$ldap_url$ldaps_url";`
`129`	`126`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ recreate them if you need to make changes. "make sslfiles-clean" is required`
`93`	`93`	`in order to recreate the full set of keypairs and certificates. To rebuild`
`94`	`94`	`separate files, touch (or remove) the files in question and run "make sslfiles".`
`95`	`95`
	`96`	`+Note`
	`97`	`+====`
	`98`	`+`
	`99`	`+These certificates are also used in other tests, e.g. the LDAP tests.`
	`100`	`+`
`96`	`101`	`TODO`
`97`	`102`	`====`
`98`	`103`

Comments

(0)