feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #6755 from anhu/GetASNInt

Browse Source 
Expose GetASNInt as part of WOLFSSL_ASN_API
This commit is contained in:
David Garske
2023-09-07 11:30:46 -07:00
committed by GitHub
parent fc4e4f1238 fddda8f582
commit 7ca6c129e5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/asn.c
View File

@ -2548,7 +2548,6 @@ int GetOctetString(const byte* input, word32* inOutIdx, int* len, word32 maxIdx)
return GetASNHeader(input, ASN_OCTET_STRING, inOutIdx, len, maxIdx); return GetASNHeader(input, ASN_OCTET_STRING, inOutIdx, len, maxIdx);
} }
#ifndef WOLFSSL_ASN_TEMPLATE
/* Get the DER/BER encoding of an ASN.1 INTEGER header. /* Get the DER/BER encoding of an ASN.1 INTEGER header.
* *
* Removes the leading zero byte when found. * Removes the leading zero byte when found.
@ -2562,7 +2561,7 @@ int GetOctetString(const byte* input, word32* inOutIdx, int* len, word32 maxIdx)
* or invalid use of or missing leading zero. * or invalid use of or missing leading zero.
* Otherwise, 0 to indicate success. * Otherwise, 0 to indicate success.
*/ */
static int GetASNInt(const byte* input, word32* inOutIdx, int* len, int GetASNInt(const byte* input, word32* inOutIdx, int* len,
word32 maxIdx) word32 maxIdx)
{ {
int ret; int ret;
@ -2598,6 +2597,7 @@ static int GetASNInt(const byte* input, word32* inOutIdx, int* len,
return 0; return 0;
} }
#ifndef WOLFSSL_ASN_TEMPLATE
#ifndef NO_CERTS #ifndef NO_CERTS
/* Get the DER/BER encoding of an ASN.1 INTEGER that has a value of no more than /* Get the DER/BER encoding of an ASN.1 INTEGER that has a value of no more than
* 7 bits. * 7 bits.

2
wolfssl/wolfcrypt/asn.h
View File

@ -2193,6 +2193,8 @@ WOLFSSL_LOCAL int GetMyVersion(const byte* input, word32* inOutIdx,
int* version, word32 maxIdx); int* version, word32 maxIdx);
WOLFSSL_LOCAL int GetInt(mp_int* mpi, const byte* input, word32* inOutIdx, WOLFSSL_LOCAL int GetInt(mp_int* mpi, const byte* input, word32* inOutIdx,
word32 maxIdx); word32 maxIdx);
WOLFSSL_ASN_API int GetASNInt(const byte* input, word32* inOutIdx, int* len,
word32 maxIdx);
#ifdef HAVE_OID_ENCODING #ifdef HAVE_OID_ENCODING
WOLFSSL_API int wc_EncodeObjectId(const word16* in, word32 inSz, WOLFSSL_API int wc_EncodeObjectId(const word16* in, word32 inSz,