diff options
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/bio_ssl.c | 2 | ||||
-rw-r--r-- | ssl/record/rec_layer_d1.c | 6 | ||||
-rw-r--r-- | ssl/record/ssl3_record.c | 8 | ||||
-rw-r--r-- | ssl/s3_enc.c | 4 | ||||
-rw-r--r-- | ssl/s3_lib.c | 12 | ||||
-rw-r--r-- | ssl/s3_msg.c | 2 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 6 | ||||
-rw-r--r-- | ssl/ssl_sess.c | 8 | ||||
-rw-r--r-- | ssl/ssl_txt.c | 4 | ||||
-rw-r--r-- | ssl/statem/statem_lib.c | 2 | ||||
-rw-r--r-- | ssl/t1_enc.c | 4 | ||||
-rw-r--r-- | ssl/tls_srp.c | 8 |
12 files changed, 33 insertions, 33 deletions
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c index 29ae258b35..6fdbdaca39 100644 --- a/ssl/bio_ssl.c +++ b/ssl/bio_ssl.c @@ -501,7 +501,7 @@ int BIO_ssl_copy_session_id(BIO *t, BIO *f) return (0); if (!SSL_copy_session_id(tdata->ssl, (fdata->ssl))) return 0; - return (1); + return 1; } void BIO_ssl_shutdown(BIO *b) diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c index 5e7aa6345a..483d2a8f7e 100644 --- a/ssl/record/rec_layer_d1.c +++ b/ssl/record/rec_layer_d1.c @@ -131,7 +131,7 @@ static int dtls1_copy_record(SSL *s, pitem *item) /* Set proper sequence number for mac calculation */ memcpy(&(s->rlayer.read_sequence[2]), &(rdata->packet[5]), 6); - return (1); + return 1; } int dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) @@ -191,7 +191,7 @@ int dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) return (-1); } - return (1); + return 1; } int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue) @@ -205,7 +205,7 @@ int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue) OPENSSL_free(item->data); pitem_free(item); - return (1); + return 1; } return (0); diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index fa7f5d94f7..ee026228eb 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -758,7 +758,7 @@ int ssl3_do_compress(SSL *ssl, SSL3_RECORD *wr) wr->input = wr->data; #endif - return (1); + return 1; } /*- @@ -844,7 +844,7 @@ int ssl3_enc(SSL *s, SSL3_RECORD *inrecs, size_t n_recs, int sending) if ((bs != 1) && !sending) return ssl3_cbc_remove_padding(rec, bs, mac_size); } - return (1); + return 1; } #define MAX_PADDING 256 @@ -1703,7 +1703,7 @@ int dtls1_process_record(SSL *s, DTLS1_BITMAP *bitmap) /* Mark receipt of record. */ dtls1_record_bitmap_update(s, bitmap); - return (1); + return 1; f_err: ssl3_send_alert(s, SSL3_AL_FATAL, al); @@ -1894,6 +1894,6 @@ int dtls1_get_record(SSL *s) goto again; /* get another record */ } - return (1); + return 1; } diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index bef9f99e7d..7200766827 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -210,7 +210,7 @@ int ssl3_change_cipher_state(SSL *s, int which) OPENSSL_cleanse(exp_key, sizeof(exp_key)); OPENSSL_cleanse(exp_iv, sizeof(exp_iv)); - return (1); + return 1; err: SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE); err2: @@ -229,7 +229,7 @@ int ssl3_setup_key_block(SSL *s) SSL_COMP *comp; if (s->s3->tmp.key_block_length != 0) - return (1); + return 1; if (!ssl_cipher_get_evp(s->session, &c, &hash, NULL, NULL, &comp, 0)) { SSLerr(SSL_F_SSL3_SETUP_KEY_BLOCK, SSL_R_CIPHER_OR_HASH_UNAVAILABLE); diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a8f5637be5..f603f1c1a3 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3986,7 +3986,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) default: return (0); } - return (1); + return 1; } long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)) @@ -4038,7 +4038,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)) default: return (0); } - return (1); + return 1; } const SSL_CIPHER *ssl3_get_cipher_by_id(uint32_t id) @@ -4310,7 +4310,7 @@ int ssl3_shutdown(SSL *s) */ if (s->quiet_shutdown || SSL_in_before(s)) { s->shutdown = (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); - return (1); + return 1; } if (!(s->shutdown & SSL_SENT_SHUTDOWN)) { @@ -4346,7 +4346,7 @@ int ssl3_shutdown(SSL *s) if ((s->shutdown == (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN)) && !s->s3->alert_dispatch) - return (1); + return 1; else return (0); } @@ -4405,10 +4405,10 @@ int ssl3_peek(SSL *s, void *buf, size_t len, size_t *readbytes) int ssl3_renegotiate(SSL *s) { if (s->handshake_func == NULL) - return (1); + return 1; s->s3->renegotiate = 1; - return (1); + return 1; } /* diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c index d7352ef570..afdac4ee32 100644 --- a/ssl/s3_msg.c +++ b/ssl/s3_msg.c @@ -56,7 +56,7 @@ int ssl3_do_change_cipher_spec(SSL *s) } s->s3->tmp.peer_finish_md_len = finish_md_len; - return (1); + return 1; } int ssl3_send_alert(SSL *s, int level, int desc) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 063c312080..9fec761714 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -604,7 +604,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth) SSLerr(SSL_F_SSL_CTX_SET_SSL_VERSION, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS); return (0); } - return (1); + return 1; } SSL *SSL_new(SSL_CTX *ctx) @@ -2739,9 +2739,9 @@ static unsigned long ssl_session_hash(const SSL_SESSION *a) static int ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) { if (a->ssl_version != b->ssl_version) - return (1); + return 1; if (a->session_id_length != b->session_id_length) - return (1); + return 1; return (memcmp(a->session_id, b->session_id, a->session_id_length)); } diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 98d6106f85..8e37025e43 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -846,7 +846,7 @@ long SSL_SESSION_set_timeout(SSL_SESSION *s, long t) if (s == NULL) return (0); s->timeout = t; - return (1); + return 1; } long SSL_SESSION_get_timeout(const SSL_SESSION *s) @@ -1022,7 +1022,7 @@ int SSL_set_session_secret_cb(SSL *s, return (0); s->ext.session_secret_cb = tls_session_secret_cb; s->ext.session_secret_cb_arg = arg; - return (1); + return 1; } int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb, @@ -1032,7 +1032,7 @@ int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb, return (0); s->ext.session_ticket_cb = cb; s->ext.session_ticket_cb_arg = arg; - return (1); + return 1; } int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len) @@ -1110,7 +1110,7 @@ int ssl_clear_bad_session(SSL *s) !(s->shutdown & SSL_SENT_SHUTDOWN) && !(SSL_in_init(s) || SSL_in_before(s))) { SSL_CTX_remove_session(s->session_ctx, s->session); - return (1); + return 1; } else return (0); } diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index cb5e86f025..c17d33a551 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -145,7 +145,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0) goto err; - return (1); + return 1; err: return (0); } @@ -186,7 +186,7 @@ int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x) if (BIO_puts(bp, "\n") <= 0) goto err; - return (1); + return 1; err: return (0); } diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 84ad2f6f25..e7abc50e76 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -47,7 +47,7 @@ int ssl3_do_write(SSL *s, int type) s->msg_callback(1, s->version, type, s->init_buf->data, (size_t)(s->init_off + s->init_num), s, s->msg_callback_arg); - return (1); + return 1; } s->init_off += written; s->init_num -= written; diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index ce7f14d8b6..1fa75c6ed3 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -310,7 +310,7 @@ int tls1_change_cipher_state(SSL *s, int which) OPENSSL_cleanse(tmp2, sizeof(tmp1)); OPENSSL_cleanse(iv1, sizeof(iv1)); OPENSSL_cleanse(iv2, sizeof(iv2)); - return (1); + return 1; err: SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE); err2: @@ -332,7 +332,7 @@ int tls1_setup_key_block(SSL *s) int ret = 0; if (s->s3->tmp.key_block_length != 0) - return (1); + return 1; if (!ssl_cipher_get_evp(s->session, &c, &hash, &mac_type, &mac_secret_size, &comp, s->ext.use_etm)) { diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c index 368cacee3d..bca51ef32e 100644 --- a/ssl/tls_srp.c +++ b/ssl/tls_srp.c @@ -31,7 +31,7 @@ int SSL_CTX_SRP_CTX_free(struct ssl_ctx_st *ctx) BN_free(ctx->srp_ctx.v); memset(&ctx->srp_ctx, 0, sizeof(ctx->srp_ctx)); ctx->srp_ctx.strength = SRP_MINIMAL_N; - return (1); + return 1; } int SSL_SRP_CTX_free(struct ssl_st *s) @@ -50,7 +50,7 @@ int SSL_SRP_CTX_free(struct ssl_st *s) BN_free(s->srp_ctx.v); memset(&s->srp_ctx, 0, sizeof(s->srp_ctx)); s->srp_ctx.strength = SRP_MINIMAL_N; - return (1); + return 1; } int SSL_SRP_CTX_init(struct ssl_st *s) @@ -106,7 +106,7 @@ int SSL_SRP_CTX_init(struct ssl_st *s) } s->srp_ctx.srp_Mask = ctx->srp_ctx.srp_Mask; - return (1); + return 1; err: OPENSSL_free(s->srp_ctx.login); OPENSSL_free(s->srp_ctx.info); @@ -130,7 +130,7 @@ int SSL_CTX_SRP_CTX_init(struct ssl_ctx_st *ctx) memset(&ctx->srp_ctx, 0, sizeof(ctx->srp_ctx)); ctx->srp_ctx.strength = SRP_MINIMAL_N; - return (1); + return 1; } /* server side */ |