mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-23 14:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

QUIC: Move CID generation to quic_types.c

Browse Source 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
This commit is contained in:
Hugo Landau 2023-12-19 16:09:04 +00:00
parent fdd60dacc4
commit d59c3febdc
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssl/quic/build.info
View File

@ -16,3 +16,4 @@ SOURCE[$LIBSSL]=quic_thread_assist.c
SOURCE[$LIBSSL]=quic_trace.c
SOURCE[$LIBSSL]=quic_srtm.c quic_srt_gen.c
SOURCE[$LIBSSL]=quic_lcidm.c
SOURCE[$LIBSSL]=quic_types.c

29
ssl/quic/quic_types.c Normal file
View File

@ -0,0 +1,29 @@
/*
* 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 "internal/quic_types.h"
#include <openssl/rand.h>
#include <openssl/err.h>
int ossl_quic_gen_rand_conn_id(OSSL_LIB_CTX *libctx, size_t len,
QUIC_CONN_ID *cid)
{
if (len > QUIC_MAX_CONN_ID_LEN)
return 0;
cid->id_len = (unsigned char)len;
if (RAND_bytes_ex(libctx, cid->id, len, len * 8) != 1) {
ERR_raise(ERR_LIB_SSL, ERR_R_RAND_LIB);
cid->id_len = 0;
return 0;
}
return 1;
}

18
ssl/quic/quic_wire.c
View File

@ -9,7 +9,6 @@
#include <openssl/macros.h>
#include <openssl/objects.h>
#include <openssl/rand.h>
#include "internal/quic_ssl.h"
#include "internal/quic_vlint.h"
#include "internal/quic_wire.h"
@ -1077,20 +1076,3 @@ const char *ossl_quic_err_to_string(uint64_t error_code)
return NULL;
}
}
int ossl_quic_gen_rand_conn_id(OSSL_LIB_CTX *libctx, size_t len,
QUIC_CONN_ID *cid)
{
if (len > QUIC_MAX_CONN_ID_LEN)
return 0;
cid->id_len = (unsigned char)len;
if (RAND_bytes_ex(libctx, cid->id, len, len * 8) != 1) {
ERR_raise(ERR_LIB_SSL, ERR_R_RAND_LIB);
cid->id_len = 0;
return 0;
}
return 1;
}