Skip to content

Commit 8cbc404

Browse files
committed
internal: rename to use wolfssl internal prefix
1 parent aa4fb5d commit 8cbc404

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed

src/dtls13.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ static int Dtls13SendFragmentedInternal(WOLFSSL* ssl)
987987
isEncrypted = Dtls13TypeIsEncrypted(
988988
(enum HandShakeType)ssl->dtls13FragHandshakeType);
989989
rlHeaderLength = Dtls13GetRlHeaderLength(ssl, isEncrypted);
990-
maxFragment = wolfSSL_GetMaxPlaintextSize(ssl);
990+
maxFragment = wolfssl_i_GetMaxPlaintextSize(ssl);
991991

992992
remainingSize = ssl->dtls13MessageLength - ssl->dtls13FragOffset;
993993

@@ -1000,7 +1000,7 @@ static int Dtls13SendFragmentedInternal(WOLFSSL* ssl)
10001000
}
10011001

10021002
recordLength = fragLength + rlHeaderLength + DTLS_HANDSHAKE_HEADER_SZ;
1003-
outputSz = wolfSSL_GetRecordSize(ssl,
1003+
outputSz = wolfssl_i_GetRecordSize(ssl,
10041004
fragLength + DTLS_HANDSHAKE_HEADER_SZ, isEncrypted);
10051005
if (outputSz < 0) {
10061006
Dtls13FreeFragmentsBuffer(ssl);
@@ -2022,7 +2022,7 @@ int Dtls13HandshakeSend(WOLFSSL* ssl, byte* message, word16 outputSize,
20222022
return ret;
20232023
}
20242024

2025-
maxFrag = wolfSSL_GetMaxPlaintextSize(ssl);
2025+
maxFrag = wolfssl_i_GetMaxPlaintextSize(ssl);
20262026
maxLen = length;
20272027

20282028
if (handshakeType == key_update)

src/internal.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10745,7 +10745,7 @@ static int SendHandshakeMsg(WOLFSSL* ssl, byte* input, word32 inputSz,
1074510745
inputSz += HANDSHAKE_HEADER_SZ;
1074610746
rHdrSz = RECORD_HEADER_SZ;
1074710747
}
10748-
maxFrag = wolfSSL_GetMaxPlaintextSize(ssl);
10748+
maxFrag = wolfssl_i_GetMaxPlaintextSize(ssl);
1074910749
#ifdef WOLFSSL_DTLS
1075010750
if (ssl->options.dtls) {
1075110751
/* In DTLS the handshake header is per fragment */
@@ -24800,7 +24800,7 @@ int SendCertificate(WOLFSSL* ssl)
2480024800
length -= (ssl->fragOffset + headerSz);
2480124801

2480224802

24803-
maxFragment = (word32)wolfSSL_GetMaxPlaintextSize(ssl);
24803+
maxFragment = (word32)wolfssl_i_GetMaxPlaintextSize(ssl);
2480424804
if (ssl->options.dtls)
2480524805
maxFragment -= DTLS_HANDSHAKE_HEADER_SZ;
2480624806
else
@@ -25961,7 +25961,7 @@ int SendData(WOLFSSL* ssl, const void* data, size_t sz)
2596125961
if (sent == (word32)sz) break;
2596225962

2596325963
buffSz = (word32)sz - sent;
25964-
outputSz = wolfSSL_GetRecordSize(ssl, (word32)buffSz, 1);
25964+
outputSz = wolfssl_i_GetRecordSize(ssl, (word32)buffSz, 1);
2596525965
#if defined(WOLFSSL_DTLS)
2596625966
if (ssl->options.dtls) {
2596725967
#if defined(WOLFSSL_DTLS_MTU)
@@ -25972,8 +25972,8 @@ int SendData(WOLFSSL* ssl, const void* data, size_t sz)
2597225972
if (outputSz > mtu) {
2597325973
#if defined(WOLFSSL_NO_DTLS_SIZE_CHECK)
2597425974
/* split instead of error out */
25975-
buffSz = min(buffSz, wolfSSL_GetMaxPlaintextSize(ssl));
25976-
outputSz = wolfSSL_GetRecordSize(ssl, (word32)buffSz, 1);
25975+
buffSz = min(buffSz, wolfssl_i_GetMaxPlaintextSize(ssl));
25976+
outputSz = wolfssl_i_GetRecordSize(ssl, (word32)buffSz, 1);
2597725977
#else
2597825978
error = DTLS_SIZE_ERROR;
2597925979
ssl->error = error;
@@ -41808,7 +41808,7 @@ int wolfSSL_AsyncPush(WOLFSSL* ssl, WC_ASYNC_DEV* asyncDev)
4180841808
* @param isEncrypted 1 if encryption is on, 0 if not
4180941809
* @return Record size for sending payloadSz of data
4181041810
*/
41811-
int wolfSSL_GetRecordSize(WOLFSSL *ssl, int payloadSz, int isEncrypted)
41811+
int wolfssl_i_GetRecordSize(WOLFSSL *ssl, int payloadSz, int isEncrypted)
4181241812
{
4181341813
int recordSz;
4181441814

@@ -41837,11 +41837,11 @@ int wolfSSL_GetRecordSize(WOLFSSL *ssl, int payloadSz, int isEncrypted)
4183741837
}
4183841838
#endif
4183941839

41840-
/** Return the maximum plaintext size for the current MTU.
41840+
/** Return the maximum plaintext size for the current Max Fragment and MTU.
4184141841
* @param ssl WOLFSSL object containing ciphersuite information.
4184241842
* @return Max plaintext size for current MTU
4184341843
*/
41844-
int wolfSSL_GetMaxPlaintextSize(WOLFSSL *ssl)
41844+
int wolfssl_i_GetMaxPlaintextSize(WOLFSSL *ssl)
4184541845
{
4184641846
int maxFrag;
4184741847

@@ -41855,8 +41855,6 @@ int wolfSSL_GetMaxPlaintextSize(WOLFSSL *ssl)
4185541855
int recordSz;
4185641856
int mtu;
4185741857

41858-
recordSz = wolfSSL_GetRecordSize(ssl, maxFrag, IsEncryptionOn(ssl, 1));
41859-
4186041858
#if defined(WOLFSSL_DTLS_MTU)
4186141859
mtu = ssl->dtlsMtuSz;
4186241860
#else

src/ssl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,7 +2905,7 @@ int wolfSSL_GetMaxOutputSize(WOLFSSL* ssl)
29052905
return BAD_FUNC_ARG;
29062906
}
29072907

2908-
return min(OUTPUT_RECORD_SIZE, wolfSSL_GetMaxPlaintextSize(ssl));
2908+
return min(OUTPUT_RECORD_SIZE, wolfssl_i_GetMaxPlaintextSize(ssl));
29092909
}
29102910

29112911

@@ -2925,8 +2925,7 @@ int wolfSSL_GetOutputSize(WOLFSSL* ssl, int inSz)
29252925
if (inSz > maxSize)
29262926
return INPUT_SIZE_E;
29272927

2928-
return BuildMessage(ssl, NULL, 0, NULL, inSz, application_data, 0, 1, 0,
2929-
CUR_ORDER);
2928+
return wolfssl_i_GetRecordSize(ssl, inSz, 1);
29302929
}
29312930

29322931

src/tls13.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4522,7 +4522,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
45224522

45234523
{
45244524
#ifdef WOLFSSL_DTLS_CH_FRAG
4525-
word16 maxFrag = wolfSSL_GetMaxPlaintextSize(ssl);
4525+
word16 maxFrag = wolfssl_i_GetMaxPlaintextSize(ssl);
45264526
word16 lenWithoutExts = args->length;
45274527
#endif
45284528

@@ -8872,7 +8872,7 @@ static int SendTls13Certificate(WOLFSSL* ssl)
88728872
if (ssl->fragOffset != 0)
88738873
length -= (ssl->fragOffset + headerSz);
88748874

8875-
maxFragment = (word32)wolfSSL_GetMaxPlaintextSize(ssl);
8875+
maxFragment = (word32)wolfssl_i_GetMaxPlaintextSize(ssl);
88768876

88778877
extIdx = 0;
88788878

wolfssl/internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6595,9 +6595,9 @@ WOLFSSL_LOCAL int VerifyClientSuite(word16 havePSK, byte cipherSuite0,
65956595
byte cipherSuite);
65966596

65976597
WOLFSSL_LOCAL int SetTicket(WOLFSSL* ssl, const byte* ticket, word32 length);
6598-
WOLFSSL_LOCAL int wolfSSL_GetRecordSize(WOLFSSL *ssl, int payloadSz,
6598+
WOLFSSL_LOCAL int wolfssl_i_GetRecordSize(WOLFSSL *ssl, int payloadSz,
65996599
int isEncrypted);
6600-
WOLFSSL_LOCAL int wolfSSL_GetMaxPlaintextSize(WOLFSSL *ssl);
6600+
WOLFSSL_LOCAL int wolfssl_i_GetMaxPlaintextSize(WOLFSSL *ssl);
66016601
WOLFSSL_LOCAL int wolfSSL_GetMaxFragSize(WOLFSSL* ssl);
66026602

66036603
#if defined(WOLFSSL_IOTSAFE) && defined(HAVE_PK_CALLBACKS)

0 commit comments

Comments
 (0)