Commit 2f0ca54c authored by Emilia Kasper's avatar Emilia Kasper
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 06611d0a

crypto/cryptlib.c

+7 −1
Original line number Diff line number Diff line
@@ -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 &&

crypto/rsa/rsa_oaep.c

+0 −5
Original line number Diff line number Diff line
@@ -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) {

demos/engines/e_chil.c

+1 −5
Original line number Diff line number Diff line
@@ -35,11 +35,7 @@ 
 * The hwcryptohook.h included here is from May 2000.

 * [Richard Levitte]

 */

#  ifdef FLAT_INC

#   include "hwcryptohook.h"

#  else

# include "vendor_defns/hwcryptohook.h"

#  endif



#  define HWCRHK_LIB_NAME "CHIL engine"

#  include "e_chil_err.c"

include/openssl/dtls1.h

+1 −6
Original line number Diff line number Diff line
@@ -37,12 +37,7 @@ extern "C" { 


# define DTLS1_CCS_HEADER_LENGTH                  1



# ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE

#  define DTLS1_AL_HEADER_LENGTH                   7

# else

# define DTLS1_AL_HEADER_LENGTH                   2

# endif





/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */

# define DTLS1_TMO_READ_COUNT                      2

include/openssl/objects.h

+1 −902

File changed.

Preview size limit exceeded, changes collapsed.