diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libssl/test/maketests.com | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libssl/test/maketests.com')
| -rw-r--r-- | src/lib/libssl/test/maketests.com | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com index 94621a655b..14cbf06088 100644 --- a/src/lib/libssl/test/maketests.com +++ b/src/lib/libssl/test/maketests.com | |||
| @@ -127,9 +127,11 @@ $ GOSUB CHECK_OPT_FILE | |||
| 127 | $! | 127 | $! |
| 128 | $! Define The TEST Files. | 128 | $! Define The TEST Files. |
| 129 | $! | 129 | $! |
| 130 | $ TEST_FILES = "BNTEST,ECTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ - | 130 | $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ - |
| 131 | "MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ - | ||
| 131 | "RC2TEST,RC4TEST,RC5TEST,"+ - | 132 | "RC2TEST,RC4TEST,RC5TEST,"+ - |
| 132 | "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ - | 133 | "DESTEST,SHATEST,SHA1TEST,SHA256T,SHA512T,"+ - |
| 134 | "MDC2TEST,RMDTEST,"+ - | ||
| 133 | "RANDTEST,DHTEST,ENGINETEST,"+ - | 135 | "RANDTEST,DHTEST,ENGINETEST,"+ - |
| 134 | "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ - | 136 | "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ - |
| 135 | "EVP_TEST" | 137 | "EVP_TEST" |