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 /crypto | |
| parent | 06611d0a1623a1ce06275b6cdd7a270d9704bf37 (diff) | |
| download | openssl-2f0ca54c32299638e5a1d7577112a7fc07774f00.tar.gz | |
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 'crypto')
| -rw-r--r-- | crypto/cryptlib.c | 8 | ||||
| -rw-r--r-- | crypto/rsa/rsa_oaep.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 01b8ce5ed1..b02236593d 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -167,7 +167,13 @@ void OPENSSL_showfatal(const char *fmta, ...) va_list ap; TCHAR buf[256]; const TCHAR *fmt; -# ifdef STD_ERROR_HANDLE /* what a dirty trick! */ + /* + * First check if it's a console application, in which case the + * error message would be printed to standard error. + * Windows CE does not have a concept of a console application, + * so we need to guard the check. + */ +# ifdef STD_ERROR_HANDLE HANDLE h; if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL && diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c index 868104f1bf..d583d236ee 100644 --- a/crypto/rsa/rsa_oaep.c +++ b/crypto/rsa/rsa_oaep.c @@ -78,11 +78,6 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, memcpy(db + emlen - flen - mdlen, from, (unsigned int)flen); if (RAND_bytes(seed, mdlen) <= 0) return 0; -#ifdef PKCS_TESTVECT - memcpy(seed, - "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f", - 20); -#endif dbmask = OPENSSL_malloc(emlen - mdlen); if (dbmask == NULL) { |