diff options
| author | Emilia Kasper <emilia@openssl.org> | 2017-02-28 14:13:40 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2017-03-01 10:44:49 +0100 |
| commit | 2f0ca54c32299638e5a1d7577112a7fc07774f00 (patch) | |
| tree | a58e3dc0178e943d22447d4eb15feb7df18a05eb /test | |
| parent | 06611d0a1623a1ce06275b6cdd7a270d9704bf37 (diff) | |
Remove some obsolete/obscure internal define switches:
- FLAT_INC
- PKCS1_CHECK (the SSL_OP_PKCS1_CHECK options have been
no-oped)
- PKCS_TESTVECT (debugging leftovers)
- SSL_AD_MISSING_SRP_USERNAME (unfinished feature)
- DTLS_AD_MISSING_HANDSHAKE_MESSAGE (unfinished feature)
- USE_OBJ_MAC (note this removes a define from the public header but
very unlikely someone would be depending on it)
- SSL_FORBID_ENULL
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 2 | ||||
| -rw-r--r-- | test/ectest.c | 7 | ||||
| -rw-r--r-- | test/rsa_test.c | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/test/build.info b/test/build.info index 12805c7c94..6bdeb8523b 100644 --- a/test/build.info +++ b/test/build.info @@ -47,7 +47,7 @@ IF[{- !$disabled{tests} -}] DEPEND[bntest]=../libcrypto SOURCE[ectest]=ectest.c - INCLUDE[ectest]=../include + INCLUDE[ectest]=.. ../include DEPEND[ectest]=../libcrypto SOURCE[ecdsatest]=ecdsatest.c diff --git a/test/ectest.c b/test/ectest.c index 0dd0ab85d8..bb2a08d59e 100644 --- a/test/ectest.c +++ b/test/ectest.c @@ -23,14 +23,11 @@ #include <stdio.h> #include <stdlib.h> -#ifdef FLAT_INC -# include "e_os.h" -#else -# include "../e_os.h" -#endif #include <string.h> #include <time.h> +#include "e_os.h" + #ifdef OPENSSL_NO_EC int main(int argc, char *argv[]) { diff --git a/test/rsa_test.c b/test/rsa_test.c index 7d06394c6c..a38be333ac 100644 --- a/test/rsa_test.c +++ b/test/rsa_test.c @@ -292,11 +292,7 @@ int main(int argc, char *argv[]) } else if (memcmp(ctext, ctext_ex, num) == 0) printf("OAEP test vector %d passed!\n", v); - /* - * Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT). Try - * decrypting ctext_ex - */ - + /* Different ciphertexts. Try decrypting ctext_ex */ num = RSA_private_decrypt(clen, ctext_ex, ptext, key, RSA_PKCS1_OAEP_PADDING); |