Commit 49b26f54 authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt SSL_DEBUG to the new generic trace API 



Co-authored-by: default avatarDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8198)
parent 16a9d374

apps/s_client.c

+3 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ typedef unsigned int u_int; 
#include <openssl/rand.h>

#include <openssl/ocsp.h>

#include <openssl/bn.h>

#include <openssl/trace.h>

#include <openssl/async.h>

#ifndef OPENSSL_NO_SRP

# include <openssl/srp.h>
@@ -1521,6 +1522,7 @@ int s_client_main(int argc, char **argv) 
            break;

        }

    }



    if (count4or6 >= 2) {

        BIO_printf(bio_err, "%s: Can't use both -4 and -6\n", prog);

        goto opthelp;
@@ -3321,8 +3323,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
        BIO_printf(bio_err, "Using Kernel TLS for sending\n");

#endif



#ifdef SSL_DEBUG

    {

    if (OSSL_TRACE_ENABLED(TLS)) {

        /* Print out local port of connection: useful for debugging */

        int sock;

        union BIO_sock_info_u info;
@@ -3335,7 +3336,6 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
        }

        BIO_ADDR_free(info.addr);

    }

#endif



#if !defined(OPENSSL_NO_NEXTPROTONEG)

    if (next_proto.status != -1) {

crypto/trace.c

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ struct trace_category_st { 


static const struct trace_category_st trace_categories[] = {

    TRACE_CATEGORY_(ANY),

    TRACE_CATEGORY_(TLS),

};



const char *OSSL_trace_get_category_name(int num)

include/openssl/trace.h

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ extern "C" { 
 * The ANY category is used as a fallback category.

 */

# define OSSL_TRACE_CATEGORY_ANY                 0 /* The fallback */

# define OSSL_TRACE_CATEGORY_NUM                 1

# define OSSL_TRACE_CATEGORY_TLS                 1

# define OSSL_TRACE_CATEGORY_NUM                 2



/* Returns the trace category number for the given |name| */

int OSSL_trace_get_category_num(const char *name);

ssl/record/ssl3_record.c

+19 −42
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "../ssl_locl.h"

#include "internal/constant_time_locl.h"

#include <openssl/trace.h>

#include <openssl/rand.h>

#include "record_locl.h"

#include "internal/cryptlib.h"
@@ -563,15 +564,10 @@ int ssl3_get_record(SSL *s) 
                 SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);

        return -1;

    }

#ifdef SSL_DEBUG

    printf("dec %lu\n", (unsigned long)rr[0].length);

    {

        size_t z;

        for (z = 0; z < rr[0].length; z++)

            printf("%02X%c", rr[0].data[z], ((z + 1) % 16) ? ' ' : '\n');

    }

    printf("\n");

#endif

    OSSL_TRACE_BEGIN(TLS) {

        BIO_printf(trc_out, "dec %lu\n", (unsigned long)rr[0].length);

        BIO_dump_indent(trc_out, rr[0].data, rr[0].length, 4);

    } OSSL_TRACE_END(TLS);



    /* r->length is now the compressed data plus mac */

    if ((sess != NULL) &&
@@ -1361,22 +1357,12 @@ int tls1_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int sending) 


    EVP_MD_CTX_free(hmac);



#ifdef SSL_DEBUG

    fprintf(stderr, "seq=");

    {

        int z;

        for (z = 0; z < 8; z++)

            fprintf(stderr, "%02X ", seq[z]);

        fprintf(stderr, "\n");

    }

    fprintf(stderr, "rec=");

    {

        size_t z;

        for (z = 0; z < rec->length; z++)

            fprintf(stderr, "%02X ", rec->data[z]);

        fprintf(stderr, "\n");

    }

#endif

    OSSL_TRACE_BEGIN(TLS) {

        BIO_printf(trc_out, "seq:\n");

        BIO_dump_indent(trc_out, seq, 8, 4);

        BIO_printf(trc_out, "rec:\n");

        BIO_dump_indent(trc_out, rec->data, rec->length, 4);

    } OSSL_TRACE_END(TLS);



    if (!SSL_IS_DTLS(ssl)) {

        for (i = 7; i >= 0; i--) {
@@ -1385,14 +1371,10 @@ int tls1_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int sending) 
                break;

        }

    }

#ifdef SSL_DEBUG

    {

        unsigned int z;

        for (z = 0; z < md_size; z++)

            fprintf(stderr, "%02X ", md[z]);

        fprintf(stderr, "\n");

    }

#endif

    OSSL_TRACE_BEGIN(TLS) {

        BIO_printf(trc_out, "md:\n");

        BIO_dump_indent(trc_out, md, md_size, 4);

    } OSSL_TRACE_END(TLS);

    return 1;

}
@@ -1683,15 +1665,10 @@ int dtls1_process_record(SSL *s, DTLS1_BITMAP *bitmap) 
        RECORD_LAYER_reset_packet_length(&s->rlayer);

        return 0;

    }

#ifdef SSL_DEBUG

    printf("dec %ld\n", rr->length);

    {

        size_t z;

        for (z = 0; z < rr->length; z++)

            printf("%02X%c", rr->data[z], ((z + 1) % 16) ? ' ' : '\n');

    }

    printf("\n");

#endif

    OSSL_TRACE_BEGIN(TLS) {

        BIO_printf(trc_out, "dec %ld\n", rr->length);

        BIO_dump_indent(trc_out, rr->data, rr->length, 4);

    } OSSL_TRACE_END(TLS);



    /* r->length is now the compressed data plus mac */

    if ((sess != NULL) && !SSL_READ_ETM(s) &&

ssl/statem/statem_clnt.c

+3 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <openssl/dh.h>

#include <openssl/bn.h>

#include <openssl/engine.h>

#include <openssl/trace.h>

#include <internal/cryptlib.h>



static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL *s, PACKET *pkt);
@@ -2347,11 +2348,9 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt) 
                     ERR_R_INTERNAL_ERROR);

            goto err;

        }

#ifdef SSL_DEBUG

        if (SSL_USE_SIGALGS(s))

            fprintf(stderr, "USING TLSv1.2 HASH %s\n",

            OSSL_TRACE1(TLS, "USING TLSv1.2 HASH %s\n",

                        md == NULL ? "n/a" : EVP_MD_name(md));

#endif



        if (!PACKET_get_length_prefixed_2(pkt, &signature)

            || PACKET_remaining(pkt) != 0) {