diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.decl | 16 | ||||
| -rw-r--r-- | build/Makefile.tests | 21 | ||||
| -rw-r--r-- | build/certs/Makefile | 38 |
3 files changed, 19 insertions, 56 deletions
diff --git a/build/Makefile.decl b/build/Makefile.decl deleted file mode 100644 index 8dca4e7..0000000 --- a/build/Makefile.decl +++ /dev/null @@ -1,16 +0,0 @@ -NULL = - -memcheck: - @for dir in $(SUBDIRS); do \ - test "$$dir" = "." || $(MAKE) -C $$dir memcheck; \ - done - -leakcheck: - @for dir in $(SUBDIRS); do \ - test "$$dir" = "." || $(MAKE) -C $$dir leakcheck; \ - done - -hellcheck: - @for dir in $(SUBDIRS); do \ - test "$$dir" = "." || $(MAKE) -C $$dir hellcheck; \ - done diff --git a/build/Makefile.tests b/build/Makefile.tests deleted file mode 100644 index c26e689..0000000 --- a/build/Makefile.tests +++ /dev/null @@ -1,21 +0,0 @@ -NULL = - -TEST_CFLAGS = \ - -DSRCDIR=\"$(abs_srcdir)\" \ - -DBUILDDIR=\"$(abs_builddir)\" \ - -DP11_KIT_FUTURE_UNSTABLE_API - -MEMCHECK_ENV = $(TEST_RUNNER) valgrind --error-exitcode=80 --quiet - -LEAKCHECK_ENV = $(TEST_RUNNER) valgrind --error-exitcode=81 --quiet --leak-check=yes - -HELLCHECK_ENV = $(TEST_RUNNER) valgrind --error-exitcode=82 --quiet --tool=helgrind - -memcheck: all - make $(AM_MAKEFLAGS) TESTS_ENVIRONMENT="$(MEMCHECK_ENV)" check-TESTS - -leakcheck: all - make $(AM_MAKEFLAGS) TESTS_ENVIRONMENT="$(LEAKCHECK_ENV)" check-TESTS - -hellcheck: all - make $(AM_MAKEFLAGS) TESTS_ENVIRONMENT="$(HELLCHECK_ENV)" check-TESTS diff --git a/build/certs/Makefile b/build/certs/Makefile index 4e61b14..033ecde 100644 --- a/build/certs/Makefile +++ b/build/certs/Makefile @@ -3,39 +3,39 @@ # We copy everything into its final location, and those test files are # distributed in the tarballs -TRUST = ../../trust/tests +TRUST = ../../trust prepare-certs: cp -v cacert3.der $(TRUST)/input/anchors - cp -v cacert3.der $(TRUST)/files - cp -v cacert3.der $(TRUST)/files - openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3.pem - openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3.pem - cat $(TRUST)/files/cacert3.pem $(TRUST)/files/cacert3.pem > $(TRUST)/files/cacert3-twice.pem - openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3-trusted.pem \ + cp -v cacert3.der $(TRUST)/fixtures + cp -v cacert3.der $(TRUST)/fixtures + openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3.pem + openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3.pem + cat $(TRUST)/fixtures/cacert3.pem $(TRUST)/fixtures/cacert3.pem > $(TRUST)/fixtures/cacert3-twice.pem + openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3-trusted.pem \ -addtrust serverAuth -addreject emailProtection \ -setalias "Custom Label" - cp $(TRUST)/files/cacert3-trusted.pem $(TRUST)/files/cacert3-trusted-server-alias.pem - openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3-trusted-alias.pem \ + cp $(TRUST)/fixtures/cacert3-trusted.pem $(TRUST)/fixtures/cacert3-trusted-server-alias.pem + openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3-trusted-alias.pem \ -setalias "Custom Label" - openssl x509 -in cacert3.der -inform DER -out $(TRUST)/files/cacert3-distrust-all.pem \ + openssl x509 -in cacert3.der -inform DER -out $(TRUST)/fixtures/cacert3-distrust-all.pem \ -addreject serverAuth -addreject clientAuth -addreject codeSigning \ -addreject emailProtection -addreject ipsecEndSystem -addreject ipsecTunnel \ -addreject ipsecUser -addreject timeStamping - openssl x509 -in verisign-v1.der -inform DER -out $(TRUST)/files/verisign-v1.pem \ + openssl x509 -in verisign-v1.der -inform DER -out $(TRUST)/fixtures/verisign-v1.pem \ -setalias "Custom Label" - cat $(TRUST)/files/cacert3-trusted-server-alias.pem \ - $(TRUST)/files/verisign-v1.pem > $(TRUST)/files/multiple.pem + cat $(TRUST)/fixtures/cacert3-trusted-server-alias.pem \ + $(TRUST)/fixtures/verisign-v1.pem > $(TRUST)/fixtures/multiple.pem cp -v cacert-ca.der $(TRUST)/input - cp -v cacert-ca.der $(TRUST)/files - openssl x509 -in redhat-newca.der -inform DER -out $(TRUST)/files/distrusted.pem \ + cp -v cacert-ca.der $(TRUST)/fixtures + openssl x509 -in redhat-newca.der -inform DER -out $(TRUST)/fixtures/distrusted.pem \ -addreject clientAuth -setalias "Red Hat Is the CA" - cp -v $(TRUST)/files/distrusted.pem $(TRUST)/input + cp -v $(TRUST)/fixtures/distrusted.pem $(TRUST)/input cp -v self-server.der $(TRUST)/input/blacklist - cp -v self-signed-with-eku.der $(TRUST)/files - cp -v self-signed-with-ku.der $(TRUST)/files + cp -v self-signed-with-eku.der $(TRUST)/fixtures + cp -v self-signed-with-ku.der $(TRUST)/fixtures cp -v testing-ca.der $(TRUST)/input/anchors - cp -v testing-server.der $(TRUST)/files + cp -v testing-server.der $(TRUST)/fixtures # Rebuild the self-signed certificates. This is almost never necessary and # will require other changes in the code, mostly here as documentation |