Commit 255cf605 authored by Rich Salz's avatar Rich Salz
Browse files

RT3895: Remove fprintf's from SSL library. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 843666ff

include/openssl/ssl.h

+2 −0
Original line number Diff line number Diff line
@@ -2029,6 +2029,8 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  288

# define SSL_F_DTLS1_PROCESS_RECORD                       257

# define SSL_F_DTLS1_READ_BYTES                           258

# define SSL_F_DTLS1_READ_FAILED                          339

# define SSL_F_DTLS1_RETRANSMIT_MESSAGE                   390

# define SSL_F_DTLS1_WRITE_APP_DATA_BYTES                 268

# define SSL_F_DTLSV1_LISTEN                              350

# define SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC          371

ssl/ssl_err.c

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_DTLS1_PREPROCESS_FRAGMENT), "dtls1_preprocess_fragment"},

    {ERR_FUNC(SSL_F_DTLS1_PROCESS_RECORD), "dtls1_process_record"},

    {ERR_FUNC(SSL_F_DTLS1_READ_BYTES), "dtls1_read_bytes"},

    {ERR_FUNC(SSL_F_DTLS1_READ_FAILED), "dtls1_read_failed"},

    {ERR_FUNC(SSL_F_DTLS1_RETRANSMIT_MESSAGE), "dtls1_retransmit_message"},

    {ERR_FUNC(SSL_F_DTLS1_WRITE_APP_DATA_BYTES),

     "dtls1_write_app_data_bytes"},

    {ERR_FUNC(SSL_F_DTLSV1_LISTEN), "DTLSv1_listen"},

ssl/statem/statem_dtls.c

+3 −5
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ WORK_STATE dtls_wait_for_dry(SSL *s) 
int dtls1_read_failed(SSL *s, int code)

{

    if (code > 0) {

        fprintf(stderr, "dtls1_read_failed(); invalid state reached\n");

        SSLerr(SSL_F_DTLS1_READ_FAILED, ERR_R_INTERNAL_ERROR);

        return 1;

    }
@@ -975,11 +975,9 @@ int dtls1_retransmit_buffered_messages(SSL *s) 
                                     dtls1_get_queue_priority

                                     (frag->msg_header.seq,

                                      frag->msg_header.is_ccs),

                                     &found) <= 0 && found) {

            fprintf(stderr, "dtls1_retransmit_message() failed\n");

                                     &found) <= 0)

            return -1;

    }

    }



    return 1;

}
@@ -1070,7 +1068,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, int *found) 


    item = pqueue_find(s->d1->sent_messages, seq64be);

    if (item == NULL) {

        fprintf(stderr, "retransmit:  message %d non-existant\n", seq);

        SSLerr(SSL_F_DTLS1_RETRANSMIT_MESSAGE, ERR_R_INTERNAL_ERROR);

        *found = 0;

        return 0;

    }