diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | fc7396568e61a510b9336d6c220aaa889c03060f (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libssl/test/tsid.com | |
| parent | 1e8701dd2507fadf6d232d93eb4299a8b79c66d5 (diff) | |
| download | openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.gz openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.bz2 openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'src/lib/libssl/test/tsid.com')
| -rw-r--r-- | src/lib/libssl/test/tsid.com | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/libssl/test/tsid.com b/src/lib/libssl/test/tsid.com index 267ace1135..b6c4e49473 100644 --- a/src/lib/libssl/test/tsid.com +++ b/src/lib/libssl/test/tsid.com | |||
| @@ -1,14 +1,17 @@ | |||
| 1 | $! TSID.COM -- Tests sid keys | 1 | $! TSID.COM -- Tests sid keys |
| 2 | $ | 2 | $ |
| 3 | $ __arch := VAX | 3 | $ __arch = "VAX" |
| 4 | $ if f$getsyi("cpu") .ge. 128 then - | 4 | $ if f$getsyi("cpu") .ge. 128 then - |
| 5 | __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") | 5 | __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") |
| 6 | $ if __arch .eqs. "" then __arch := UNK | 6 | $ if __arch .eqs. "" then __arch = "UNK" |
| 7 | $ exe_dir := sys$disk:[-.'__arch'.exe.apps] | 7 | $! |
| 8 | $ if (p2 .eqs. "64") then __arch = __arch+ "_64" | ||
| 9 | $! | ||
| 10 | $ exe_dir = "sys$disk:[-.''__arch'.exe.apps]" | ||
| 8 | $ | 11 | $ |
| 9 | $ cmd := mcr 'exe_dir'openssl sess_id | 12 | $ cmd = "mcr ''exe_dir'openssl sess_id" |
| 10 | $ | 13 | $ |
| 11 | $ t := testsid.pem | 14 | $ t = "testsid.pem" |
| 12 | $ if p1 .nes. "" then t = p1 | 15 | $ if p1 .nes. "" then t = p1 |
| 13 | $ | 16 | $ |
| 14 | $ write sys$output "testing session-id conversions" | 17 | $ write sys$output "testing session-id conversions" |