diff options
| author |   djm <djm@openbsd.org> | 2006-06-27 05:06:51 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2006-06-27 05:06:51 +0000 |
| commit | 6d388760ec629bdebe2f200913a35899243a7957 (patch) | |
| tree | ecc7cf9ca37d08421471848c6f746702ed91b8e8 /lib/libssl/src/test | |
| parent | import of openssl-0.9.7j (diff) | |
| download | wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.tar.xz wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/src/test')
| -rw-r--r-- | lib/libssl/src/test/maketests.com | 2 | ||||
| -rw-r--r-- | lib/libssl/src/test/tverify.com | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/src/test/maketests.com b/lib/libssl/src/test/maketests.com index dfbfef7b1bb..94621a655b7 100644 --- a/lib/libssl/src/test/maketests.com +++ b/lib/libssl/src/test/maketests.com @@ -586,7 +586,7 @@ $ CCDEFS = "TCPIP_TYPE_''P3'" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX" +$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS $! diff --git a/lib/libssl/src/test/tverify.com b/lib/libssl/src/test/tverify.com index 2060184d1ef..021d701d79a 100644 --- a/lib/libssl/src/test/tverify.com +++ b/lib/libssl/src/test/tverify.com @@ -8,22 +8,22 @@ $ copy/concatenate [-.certs]*.pem certs.tmp $ $ old_f := $ loop_certs: -$ c := NO +$ verify := NO +$ more := YES $ certs := $ loop_certs2: $ f = f$search("[-.certs]*.pem") $ if f .nes. "" .and. f .nes. old_f $ then $ certs = certs + " [-.certs]" + f$parse(f,,,"NAME") + ".pem" -$ c := YES +$ verify := YES $ if f$length(certs) .lt. 180 then goto loop_certs2 +$ else +$ more := NO $ endif $ certs = certs - " " $ -$ if c -$ then -$ mcr 'exe_dir'openssl verify "-CAfile" certs.tmp 'certs' -$ goto loop_certs -$ endif +$ if verify then mcr 'exe_dir'openssl verify "-CAfile" certs.tmp 'certs' +$ if more then goto loop_certs $ $ delete certs.tmp;* |