Skip to content

Commit

Permalink
Create internal/ssl.h
Browse files Browse the repository at this point in the history
We create the internal/ssl.h header file and move the typedef for
ossl_msg_cb. This is needed by both the QUIC code (which generally doesn't
include ssl_local.h) and the rest of libssl.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from openssl/openssl#20914)
  • Loading branch information
mattcaswell authored and MrE-Fog committed Jun 4, 2023
1 parent b9472d1 commit 1591830
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
4 changes: 1 addition & 3 deletions include/internal/quic_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# define OSSL_QUIC_TYPES_H

# include <openssl/ssl.h>
# include <internal/ssl.h>
# include <assert.h>
# include <string.h>

Expand Down Expand Up @@ -95,9 +96,6 @@ static ossl_unused ossl_inline int ossl_quic_conn_id_eq(const QUIC_CONN_ID *a,

# define QUIC_STATELESS_RESET_TOKEN_LEN 16

typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
const void *buf, size_t len, SSL *ssl, void *arg);

# endif

#endif
19 changes: 19 additions & 0 deletions include/internal/ssl.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/

#include <openssl/ssl.h>

#ifndef OSSL_INTERNAL_SSL_H
# define OSSL_INTERNAL_SSL_H
# pragma once

typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
const void *buf, size_t len, SSL *ssl, void *arg);

#endif
4 changes: 1 addition & 3 deletions ssl/ssl_local.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
# include "internal/bio.h"
# include "internal/ktls.h"
# include "internal/time.h"
# include "internal/ssl.h"
# include "record/record.h"

# ifdef OPENSSL_BUILD_SHLIBSSL
Expand Down Expand Up @@ -799,9 +800,6 @@ typedef struct {

# define TLS_GROUP_FFDHE_FOR_TLS1_3 (TLS_GROUP_FFDHE|TLS_GROUP_ONLY_FOR_TLS1_3)

typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
const void *buf, size_t len, SSL *ssl, void *arg);

struct ssl_ctx_st {
OSSL_LIB_CTX *libctx;

Expand Down

0 comments on commit 1591830

Please sign in to comment.