Skip to content

Add CCM cipher suite variants #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
boaks wants to merge 3 commits into from
Closed

Add CCM cipher suite variants #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a290a3e
dtls.c: add support for CCM cipher suites.
boaks Oct 18, 2021
b8c4db1
dtls.c: add cipher_suite_param_t
boaks Dec 19, 2021
456b7fb
Introduce cipher_index.
boaks May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ dtls_security_parameters_t *dtls_security_new(void)
memset(security, 0, sizeof(*security));

if (security) {
security->cipher = TLS_NULL_WITH_NULL_NULL;
security->cipher_index = DTLS_CIPHER_INDEX_NULL;
security->compression = TLS_COMPRESSION_NULL;
}
return security;
Expand Down
6 changes: 4 additions & 2 deletions crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
#define DTLS_MASTER_SECRET_LENGTH 48
#define DTLS_RANDOM_LENGTH 32

#define DTLS_CIPHER_INDEX_NULL 0

typedef enum { AES128=0
} dtls_crypto_alg;

Expand Down Expand Up @@ -105,7 +107,7 @@ typedef struct {
typedef struct {
dtls_compression_t compression; /**< compression method */

dtls_cipher_t cipher; /**< cipher type */
int cipher_index; /**< internal index for cipher_suite_params, DTLS_CIPHER_INDEX_NULL for TLS_NULL_WITH_NULL_NULL */

@obgm obgm Jun 16, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Being an index into an array, size_t would be the correct data type here.
(As the array usually should not have more than, say, 255 non-NULL elements, another unsigned type such as uint8_t might do as well. However, I do not expect cipher_index to be negative at any point in time.)

uint16_t epoch; /**< counter for cipher state changes*/
uint64_t rseq; /**< sequence number of last record sent */

Expand Down Expand Up @@ -135,7 +137,7 @@ typedef struct {
dtls_hs_state_t hs_state; /**< handshake protocol status */

dtls_compression_t compression; /**< compression method */
dtls_cipher_t cipher; /**< cipher type */
int cipher_index; /**< internal index for cipher_suite_params, DTLS_CIPHER_INDEX_NULL for TLS_NULL_WITH_NULL_NULL */

@obgm obgm Jun 16, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above

unsigned int do_client_auth:1;
unsigned int extended_master_secret:1;
union {
Expand Down
Loading