Commit d63a5e5e authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove outdated DEBUG flags. 



Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
  DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
  RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 1bd8bc55

Configure

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx 
# Minimum warning options... any contributions to OpenSSL should at least get

# past these.



my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED"

my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED -DBIO_DEBUG"

        . " -pedantic"

        . " -Wall"

        . " -Wno-long-long"

apps/apps.c

+9 −63
Original line number Diff line number Diff line
@@ -1462,9 +1462,6 @@ int save_serial(char *serialfile, char *suffix, BIGNUM *serial, 
        j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, suffix);

#endif

    }

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: writing \"%s\"\n", buf[0]);

#endif

    out = BIO_new_file(buf[0], "w");

    if (out == NULL) {

        ERR_print_errors(bio_err);
@@ -1503,17 +1500,10 @@ int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix) 
    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, new_suffix);

#else

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, new_suffix);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", serialfile, old_suffix);

#else

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", serialfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", serialfile, old_suffix);

#endif

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",

               serialfile, buf[1]);

#endif

    if (rename(serialfile, buf[1]) < 0 && errno != ENOENT

#ifdef ENOTDIR
@@ -1525,10 +1515,6 @@ int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix) 
        perror("reason");

        goto err;

    }

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",

               buf[0], serialfile);

#endif

    if (rename(buf[0], serialfile) < 0) {

        BIO_printf(bio_err,

                   "unable to rename %s to %s\n", buf[0], serialfile);
@@ -1604,10 +1590,6 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr) 
    if (dbattr_conf) {

        char *p = NCONF_get_string(dbattr_conf, NULL, "unique_subject");

        if (p) {

#ifdef RL_DEBUG

            BIO_printf(bio_err,

                       "DEBUG[load_index]: unique_subject = \"%s\"\n", p);

#endif

            retdb->attributes.unique_subject = parse_yesno(p, 1);

        }

    }
@@ -1654,21 +1636,12 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db) 
    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr", dbfile);

#else

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr", dbfile);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.attr.%s", dbfile, suffix);

#else

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-attr-%s", dbfile, suffix);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, suffix);

#else

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr", dbfile);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-attr-%s", dbfile, suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, suffix);

#endif

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: writing \"%s\"\n", buf[0]);

#endif

    out = BIO_new_file(buf[0], "w");

    if (out == NULL) {
@@ -1682,9 +1655,6 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db) 
        goto err;



    out = BIO_new_file(buf[1], "w");

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: writing \"%s\"\n", buf[1]);

#endif

    if (out == NULL) {

        perror(buf[2]);

        BIO_printf(bio_err, "unable to open '%s'\n", buf[2]);
@@ -1715,31 +1685,16 @@ int rotate_index(const char *dbfile, const char *new_suffix, 
    }

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s.attr", dbfile);

#else

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s-attr", dbfile);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s.attr.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s.attr.%s", dbfile, new_suffix);

#else

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr-%s", dbfile, new_suffix);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, new_suffix);

#else

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, new_suffix);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s", dbfile, new_suffix);

#else

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", dbfile, old_suffix);

#endif

#ifndef OPENSSL_SYS_VMS

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s.attr.%s", dbfile, old_suffix);

#else

    j = BIO_snprintf(buf[4], sizeof buf[4], "%s-attr", dbfile);

    j = BIO_snprintf(buf[3], sizeof buf[3], "%s-attr-%s", dbfile, old_suffix);

#endif

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", dbfile, buf[1]);

    j = BIO_snprintf(buf[2], sizeof buf[2], "%s-attr-%s", dbfile, new_suffix);

    j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s", dbfile, old_suffix);

    j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s", dbfile, new_suffix);

#endif

    if (rename(dbfile, buf[1]) < 0 && errno != ENOENT

#ifdef ENOTDIR
@@ -1750,18 +1705,12 @@ int rotate_index(const char *dbfile, const char *new_suffix, 
        perror("reason");

        goto err;

    }

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", buf[0], dbfile);

#endif

    if (rename(buf[0], dbfile) < 0) {

        BIO_printf(bio_err, "unable to rename %s to %s\n", buf[0], dbfile);

        perror("reason");

        rename(buf[1], dbfile);

        goto err;

    }

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", buf[4], buf[3]);

#endif

    if (rename(buf[4], buf[3]) < 0 && errno != ENOENT

#ifdef ENOTDIR

        && errno != ENOTDIR
@@ -1773,9 +1722,6 @@ int rotate_index(const char *dbfile, const char *new_suffix, 
        rename(buf[1], dbfile);

        goto err;

    }

#ifdef RL_DEBUG

    BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", buf[2], buf[4]);

#endif

    if (rename(buf[2], buf[4]) < 0) {

        BIO_printf(bio_err, "unable to rename %s to %s\n", buf[2], buf[4]);

        perror("reason");

apps/x509.c

+0 −21
Original line number Diff line number Diff line
@@ -89,10 +89,6 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, 
                        char *section, ASN1_INTEGER *sno, int reqfile);

static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);



#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL

static int force_version = 2;

#endif



typedef enum OPTION_choice {

    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,

    OPT_INFORM, OPT_OUTFORM, OPT_KEYFORM, OPT_REQ, OPT_CAFORM,
@@ -108,7 +104,6 @@ typedef enum OPTION_choice { 
    OPT_CLRREJECT, OPT_ALIAS, OPT_CACREATESERIAL, OPT_CLREXT, OPT_OCSPID,

    OPT_SUBJECT_HASH_OLD,

    OPT_ISSUER_HASH_OLD,

    OPT_FORCE_VERSION,

    OPT_BADSIG, OPT_MD, OPT_ENGINE, OPT_NOCERT

} OPTION_CHOICE;
@@ -189,9 +184,6 @@ OPTIONS x509_options[] = { 
    {"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',

     "Print old-style (MD5) subject hash value"},

#endif

#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL

    {"force_version", OPT_FORCE_VERSION, 'p'},

#endif

#ifndef OPENSSL_NO_ENGINE

    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},

#endif
@@ -288,11 +280,6 @@ int x509_main(int argc, char **argv) 
            if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, opt_arg()))

                goto opthelp;

            break;

        case OPT_FORCE_VERSION:

#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL

            force_version = atoi(opt_arg()) - 1;

#endif

            break;

        case OPT_DAYS:

            days = atoi(opt_arg());

            break;
@@ -1046,11 +1033,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, 


    if (conf) {

        X509V3_CTX ctx2;

#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL

        X509_set_version(x, force_version);

#else

        X509_set_version(x, 2); /* version 3 certificate */

#endif

        X509V3_set_ctx(&ctx2, xca, x, NULL, NULL, 0);

        X509V3_set_nconf(&ctx2, conf);

        if (!X509V3_EXT_add_nconf(conf, &ctx2, section, x))
@@ -1123,11 +1106,7 @@ static int sign(X509 *x, EVP_PKEY *pkey, int days, int clrext, 
    }

    if (conf) {

        X509V3_CTX ctx;

#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL

        X509_set_version(x, force_version);

#else

        X509_set_version(x, 2); /* version 3 certificate */

#endif

        X509V3_set_ctx(&ctx, x, x, NULL, NULL, 0);

        X509V3_set_nconf(&ctx, conf);

        if (!X509V3_EXT_add_nconf(conf, &ctx, section, x))

crypto/bn/bn_ctx.c

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ 
 *

 */



#if !defined(BN_CTX_DEBUG) && !defined(BN_DEBUG)

# ifndef NDEBUG

#  define NDEBUG

# endif

#endif



#include <assert.h>



#include "internal/cryptlib.h"

#include "bn_lcl.h"

crypto/camellia/cmll_ecb.c

+0 −11
Original line number Diff line number Diff line
@@ -48,23 +48,12 @@ 
 *

 */



#ifndef CAMELLIA_DEBUG

# ifndef NDEBUG

#  define NDEBUG

# endif

#endif

#include <assert.h>



#include <openssl/camellia.h>

#include "cmll_locl.h"



void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,

                          const CAMELLIA_KEY *key, const int enc)

{



    assert(in && out && key);

    assert((CAMELLIA_ENCRYPT == enc) || (CAMELLIA_DECRYPT == enc));



    if (CAMELLIA_ENCRYPT == enc)

        Camellia_encrypt(in, out, key);

    else