eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8235 from daverodgman/misc-size

Browse source
This commit is contained in:
Dave Rodgman 2023-09-21 18:42:37 +01:00 • committed by GitHub
commit aaebc9be51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/ccm.h
View file

@ -77,8 +77,6 @@ extern "C" {
typedef struct mbedtls_ccm_context { typedef struct mbedtls_ccm_context {
unsigned char MBEDTLS_PRIVATE(y)[16]; /*!< The Y working buffer */ unsigned char MBEDTLS_PRIVATE(y)[16]; /*!< The Y working buffer */
unsigned char MBEDTLS_PRIVATE(ctr)[16]; /*!< The counter buffer */ unsigned char MBEDTLS_PRIVATE(ctr)[16]; /*!< The counter buffer */
int MBEDTLS_PRIVATE(state); /*!< Working value holding context's
state. Used for chunked data input */
size_t MBEDTLS_PRIVATE(plaintext_len); /*!< Total plaintext length */ size_t MBEDTLS_PRIVATE(plaintext_len); /*!< Total plaintext length */
size_t MBEDTLS_PRIVATE(add_len); /*!< Total authentication data length */ size_t MBEDTLS_PRIVATE(add_len); /*!< Total authentication data length */
size_t MBEDTLS_PRIVATE(tag_len); /*!< Total tag length */ size_t MBEDTLS_PRIVATE(tag_len); /*!< Total tag length */
@ -95,6 +93,8 @@ typedef struct mbedtls_ccm_context {
#MBEDTLS_CCM_STAR_ENCRYPT or #MBEDTLS_CCM_STAR_ENCRYPT or
#MBEDTLS_CCM_STAR_DECRYPT. */ #MBEDTLS_CCM_STAR_DECRYPT. */
mbedtls_cipher_context_t MBEDTLS_PRIVATE(cipher_ctx); /*!< The cipher context used. */ mbedtls_cipher_context_t MBEDTLS_PRIVATE(cipher_ctx); /*!< The cipher context used. */
int MBEDTLS_PRIVATE(state); /*!< Working value holding context's
state. Used for chunked data input */
} }
mbedtls_ccm_context; mbedtls_ccm_context;

53
library/asn1parse.c
View file

@ -47,47 +47,18 @@ int mbedtls_asn1_get_len(unsigned char **p,
if ((**p & 0x80) == 0) { if ((**p & 0x80) == 0) {
*len = *(*p)++; *len = *(*p)++;
} else { } else {
switch (**p & 0x7F) { int n = (**p) & 0x7F;
case 1: if (n == 0 || n > 4) {
if ((end - *p) < 2) { return MBEDTLS_ERR_ASN1_INVALID_LENGTH;
return MBEDTLS_ERR_ASN1_OUT_OF_DATA; }
} if ((end - *p) <= n) {
return MBEDTLS_ERR_ASN1_OUT_OF_DATA;
*len = (*p)[1]; }
(*p) += 2; *len = 0;
break; (*p)++;
while (n--) {
case 2: *len = (*len << 8) | **p;
if ((end - *p) < 3) { (*p)++;
return MBEDTLS_ERR_ASN1_OUT_OF_DATA;
}
*len = ((size_t) (*p)[1] << 8) | (*p)[2];
(*p) += 3;
break;
case 3:
if ((end - *p) < 4) {
return MBEDTLS_ERR_ASN1_OUT_OF_DATA;
}
*len = ((size_t) (*p)[1] << 16) |
((size_t) (*p)[2] << 8) | (*p)[3];
(*p) += 4;
break;
case 4:
if ((end - *p) < 5) {
return MBEDTLS_ERR_ASN1_OUT_OF_DATA;
}
*len = ((size_t) (*p)[1] << 24) | ((size_t) (*p)[2] << 16) |
((size_t) (*p)[3] << 8) | (*p)[4];
(*p) += 5;
break;
default:
return MBEDTLS_ERR_ASN1_INVALID_LENGTH;
} }
} }