Skip to content

Commit e8793bb

Browse files
ejohnstownpadelsbach
authored andcommitted
UTF-8 -> 7-bit ASCII cleanup
1. replace section symbol with 'sec' 2. replace right arrow with '->' 3. replace m-dash with '--' 4. replace less-than-equatal-to with '<='
1 parent 67496a3 commit e8793bb

6 files changed

Lines changed: 52 additions & 52 deletions

File tree

ide/Renesas/cs+/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This demo is tested with the following condition.
4545
- Add project properties of linking library in ap_rx71m_0a_usbfunc_sample_cs.mtpj
4646
wolfssh\ide\Renesas\cs+\Projects\wolfssl_lib\DefaultBuild\wolfssl_lib.lib
4747
wolfssh\ide\Renesas\cs+\Projects\wolfssh_lib\DefaultBuild\wolfssh_lib.lib
48-
  wolfssh\ide\Renesas\cs+\Projects\demo_server\DefaultBuild\demo_sever.lib
48+
wolfssh\ide\Renesas\cs+\Projects\demo_server\DefaultBuild\demo_sever.lib
4949

5050
- Set CC-RX(Build Tool)->Library Geberation->Library Configuration to"C99" and enable ctype.h.
5151

ide/winvs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ If you build the wolfSSL FIPS code in the **Release x64** configuration,
9797
then you should build wolfSSH with the **ReleaseFIPS x64** configuration.
9898

9999
Similarly:
100-
- wolfSSL **Debug x64** wolfSSH **DebugFIPS x64**
101-
- wolfSSL **Release Win32** wolfSSH **ReleaseFIPS Win32**
102-
- wolfSSL **DLL Release x64** wolfSSH **DLL ReleaseFIPS x64**
100+
- wolfSSL **Debug x64** -> wolfSSH **DebugFIPS x64**
101+
- wolfSSL **Release Win32** -> wolfSSH **ReleaseFIPS Win32**
102+
- wolfSSL **DLL Release x64** -> wolfSSH **DLL ReleaseFIPS x64**
103103

104104
**Notes:**
105105
* wolfSSH examples and applications might initially fail because the FIPS Integrity

src/internal.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9723,7 +9723,7 @@ static int DoChannelRequest(WOLFSSH* ssh,
97239723
else if (WSTRNCMP(type, "window-change", typeSz) == 0) {
97249724
word32 widthChar, heightRows, widthPixels, heightPixels;
97259725

9726-
wantReply = 0; /* RFC 4254 §6.7: no reply for window-change */
9726+
wantReply = 0; /* RFC 4254 sec 6.7: no reply for window-change */
97279727
ret = GetUint32(&widthChar, buf, len, &begin);
97289728
if (ret == WS_SUCCESS)
97299729
ret = GetUint32(&heightRows, buf, len, &begin);
@@ -9753,7 +9753,7 @@ static int DoChannelRequest(WOLFSSH* ssh,
97539753
#endif /* WOLFSSH_SHELL && WOLFSSH_TERM */
97549754
#if defined(WOLFSSH_TERM) || defined(WOLFSSH_SHELL)
97559755
else if (WSTRNCMP(type, "exit-status", typeSz) == 0) {
9756-
wantReply = 0; /* RFC 4254 §6.10: no reply for exit-status */
9756+
wantReply = 0; /* RFC 4254 sec 6.10: no reply for exit-status */
97579757
ret = GetUint32(&ssh->exitStatus, buf, len, &begin);
97589758
WLOG(WS_LOG_AGENT, "Got exit status %u.", ssh->exitStatus);
97599759
}
@@ -9762,7 +9762,7 @@ static int DoChannelRequest(WOLFSSH* ssh,
97629762
word32 sigSz;
97639763
byte coreDumped;
97649764

9765-
wantReply = 0; /* RFC 4254 §6.10: no reply for exit-signal */
9765+
wantReply = 0; /* RFC 4254 sec 6.10: no reply for exit-signal */
97669766
WLOG(WS_LOG_AGENT, "Got exit signal, remote command terminated");
97679767

97689768
sigSz = WOLFSSH_MAX_NAMESZ;

tests/auth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ static void test_pubkey_auth_wrong_key(void)
829829

830830
/* -----------------------------------------------------------------------
831831
* Password auth: unknown callback return value must not grant auth (issue 2486)
832-
* This block intentionally has no NO_SHA256 guard password auth does not
832+
* This block intentionally has no NO_SHA256 guard -- password auth does not
833833
* use SHA256. The surrounding utility functions (tcp_listen, load_key, etc.)
834834
* are available because they share the base server/client/threading guard.
835835
* ----------------------------------------------------------------------- */

tests/regress.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,8 +1491,8 @@ static void TestGlobalRequestFwdCancelWithCbSendsSuccess(void)
14911491
}
14921492

14931493
/* Verify DoRequestSuccess correctly consumes a uint32 port payload (RFC 4254
1494-
* §4) without treating it as a length prefix, which would overrun the buffer
1495-
* and produce WS_BUFFER_E. */
1494+
* sec 4) without treating it as a length prefix, which would overrun the
1495+
* buffer and produce WS_BUFFER_E. */
14961496
static void TestRequestSuccessWithPortParsesCorrectly(void)
14971497
{
14981498
ChannelOpenHarness harness;
@@ -2207,23 +2207,23 @@ static void TestIndependentAlgoNegotiation(void)
22072207
AssertIntEQ(ssh->handshake->macId, ID_HMAC_SHA2_256);
22082208
AssertIntEQ(ssh->handshake->peerAeadMode, 0);
22092209
AssertIntEQ(ssh->handshake->aeadMode, 0);
2210-
/* Key sizes server: C2SpeerKeys, S2Ckeys. Validates the
2210+
/* Key sizes -- server: C2S->peerKeys, S2C->keys. Validates the
22112211
* side-aware DoKexInit fix: wrong mapping would swap these sizes. */
22122212
AssertIntEQ(ssh->handshake->peerKeys.encKeySz, AES_128_KEY_SIZE);
22132213
AssertIntEQ(ssh->handshake->keys.encKeySz, AES_256_KEY_SIZE);
22142214
AssertIntEQ(ssh->handshake->peerKeys.ivSz, AES_BLOCK_SIZE);
22152215
AssertIntEQ(ssh->handshake->keys.ivSz, AES_BLOCK_SIZE);
22162216
AssertIntEQ(ssh->handshake->peerKeys.macKeySz, WC_SHA_DIGEST_SIZE);
22172217
AssertIntEQ(ssh->handshake->keys.macKeySz, WC_SHA256_DIGEST_SIZE);
2218-
/* Block/mac sizes server: C2Speer*, S2Clocal. */
2218+
/* Block/mac sizes -- server: C2S->peer*, S2C->local. */
22192219
AssertIntEQ(ssh->handshake->peerBlockSz, AES_BLOCK_SIZE);
22202220
AssertIntEQ(ssh->handshake->blockSz, AES_BLOCK_SIZE);
22212221
AssertIntEQ(ssh->handshake->peerMacSz, WC_SHA_DIGEST_SIZE);
22222222
AssertIntEQ(ssh->handshake->macSz, WC_SHA256_DIGEST_SIZE);
22232223
wolfSSH_free(ssh);
22242224

22252225
#ifndef WOLFSSH_NO_AES_GCM
2226-
/* Sub-test B: AEAD S2C, non-AEAD C2S MAC only negotiated for C2S */
2226+
/* Sub-test B: AEAD S2C, non-AEAD C2S -- MAC only negotiated for C2S */
22272227
ssh = wolfSSH_new(ctx);
22282228
AssertNotNull(ssh);
22292229
AssertIntEQ(wolfSSH_SetAlgoListKex(ssh, FPF_KEX_GOOD), WS_SUCCESS);
@@ -2280,8 +2280,8 @@ static void TestIndependentAlgoNegotiationClient(void)
22802280
AssertNotNull(ctx);
22812281

22822282
/* Sub-test A: different non-AEAD cipher and MAC per direction.
2283-
* Client mapping is the mirror of server: C2Skeys/encryptId,
2284-
* S2CpeerKeys/peerEncryptId. A swap bug would make these asserts fail. */
2283+
* Client mapping is the mirror of server: C2S->keys/encryptId,
2284+
* S2C->peerKeys/peerEncryptId. A swap bug would make these asserts fail. */
22852285
ssh = wolfSSH_new(ctx);
22862286
AssertNotNull(ssh);
22872287
AssertIntEQ(wolfSSH_SetAlgoListKex(ssh, FPF_KEX_GOOD), WS_SUCCESS);
@@ -2302,7 +2302,7 @@ static void TestIndependentAlgoNegotiationClient(void)
23022302
* callback is set up. We only care about the negotiated algorithm IDs. */
23032303
(void)wolfSSH_TestDoKexInit(ssh, payload, payloadSz, &idx);
23042304
AssertNotNull(ssh->handshake);
2305-
/* Client: C2S is local outgoing encryptId/keys */
2305+
/* Client: C2S is local outgoing -> encryptId/keys */
23062306
AssertIntEQ(ssh->handshake->encryptId, ID_AES128_CBC);
23072307
AssertIntEQ(ssh->handshake->peerEncryptId, ID_AES256_CTR);
23082308
AssertIntEQ(ssh->handshake->macId, ID_HMAC_SHA1);
@@ -2315,15 +2315,15 @@ static void TestIndependentAlgoNegotiationClient(void)
23152315
AssertIntEQ(ssh->handshake->peerKeys.ivSz, AES_BLOCK_SIZE);
23162316
AssertIntEQ(ssh->handshake->keys.macKeySz, WC_SHA_DIGEST_SIZE);
23172317
AssertIntEQ(ssh->handshake->peerKeys.macKeySz, WC_SHA256_DIGEST_SIZE);
2318-
/* Block/mac sizes client: C2Slocal (block/macSz), S2Cpeer (peerBlock/MacSz). */
2318+
/* Block/mac sizes -- client: C2S->local (block/macSz), S2C->peer (peerBlock/MacSz). */
23192319
AssertIntEQ(ssh->handshake->blockSz, AES_BLOCK_SIZE);
23202320
AssertIntEQ(ssh->handshake->peerBlockSz, AES_BLOCK_SIZE);
23212321
AssertIntEQ(ssh->handshake->macSz, WC_SHA_DIGEST_SIZE);
23222322
AssertIntEQ(ssh->handshake->peerMacSz, WC_SHA256_DIGEST_SIZE);
23232323
wolfSSH_free(ssh);
23242324

23252325
#ifndef WOLFSSH_NO_AES_GCM
2326-
/* Sub-test B: AEAD S2C, non-AEAD C2S client perspective. */
2326+
/* Sub-test B: AEAD S2C, non-AEAD C2S -- client perspective. */
23272327
ssh = wolfSSH_new(ctx);
23282328
AssertNotNull(ssh);
23292329
AssertIntEQ(wolfSSH_SetAlgoListKex(ssh, FPF_KEX_GOOD), WS_SUCCESS);
@@ -2344,7 +2344,7 @@ static void TestIndependentAlgoNegotiationClient(void)
23442344
* callback is set up. We only care about the negotiated algorithm IDs. */
23452345
(void)wolfSSH_TestDoKexInit(ssh, payload, payloadSz, &idx);
23462346
AssertNotNull(ssh->handshake);
2347-
/* Client: C2SencryptId/keys, S2CpeerEncryptId/peerKeys */
2347+
/* Client: C2S->encryptId/keys, S2C->peerEncryptId/peerKeys */
23482348
AssertIntEQ(ssh->handshake->encryptId, ID_AES128_CBC);
23492349
AssertIntEQ(ssh->handshake->peerEncryptId, ID_AES256_GCM);
23502350
AssertIntEQ(ssh->handshake->aeadMode, 0);
@@ -2369,7 +2369,7 @@ static void TestIndependentAlgoNegotiationClient(void)
23692369
}
23702370

23712371
/* Verify WS_MATCH_ENC_ALGO_E when exactly one direction's cipher list has no
2372-
* match in the local algoListCipher the new per-direction S2C matching path
2372+
* match in the local algoListCipher -- the new per-direction S2C matching path
23732373
* introduced by the independent-algo-negotiation change. */
23742374
static void TestEncMismatch(void)
23752375
{
@@ -2433,7 +2433,7 @@ static void TestEncMismatch(void)
24332433
}
24342434

24352435
/* Verify WS_MATCH_MAC_ALGO_E when exactly one direction's MAC list has no
2436-
* match in the local algoListMac the new per-direction S2C MAC matching path.
2436+
* match in the local algoListMac -- the new per-direction S2C MAC matching path.
24372437
* Both cipher directions must succeed so that MAC negotiation is reached. */
24382438
static void TestMacMismatch(void)
24392439
{
@@ -2541,7 +2541,7 @@ static void TestGenerateKeysSplit(void)
25412541
(void)wolfSSH_TestDoKexInit(ssh, payload, payloadSz, &idx);
25422542
AssertNotNull(ssh->handshake);
25432543

2544-
/* Synthetic K/H/sessionId any non-zero values produce valid key material. */
2544+
/* Synthetic K/H/sessionId -- any non-zero values produce valid key material. */
25452545
WMEMSET(ssh->k, 0xAA, WC_SHA256_DIGEST_SIZE);
25462546
ssh->kSz = WC_SHA256_DIGEST_SIZE;
25472547
WMEMSET(ssh->h, 0xBB, WC_SHA256_DIGEST_SIZE);
@@ -2551,15 +2551,15 @@ static void TestGenerateKeysSplit(void)
25512551

25522552
AssertIntEQ(wolfSSH_TestGenerateKeys(ssh, ssh->handshake->kexHashId), WS_SUCCESS);
25532553

2554-
/* C2S direction (server: peerKeys) aes128-cbc + hmac-sha1. */
2554+
/* C2S direction (server: peerKeys) -- aes128-cbc + hmac-sha1. */
25552555
AssertIntEQ(ssh->handshake->peerKeys.encKeySz, AES_128_KEY_SIZE);
25562556
AssertTrue(WMEMCMP(ssh->handshake->peerKeys.encKey, zeros,
25572557
AES_128_KEY_SIZE) != 0);
25582558
AssertIntEQ(ssh->handshake->peerKeys.macKeySz, WC_SHA_DIGEST_SIZE);
25592559
AssertTrue(WMEMCMP(ssh->handshake->peerKeys.macKey, zeros,
25602560
WC_SHA_DIGEST_SIZE) != 0);
25612561

2562-
/* S2C direction (server: keys) aes256-ctr + hmac-sha2-256. */
2562+
/* S2C direction (server: keys) -- aes256-ctr + hmac-sha2-256. */
25632563
AssertIntEQ(ssh->handshake->keys.encKeySz, AES_256_KEY_SIZE);
25642564
AssertTrue(WMEMCMP(ssh->handshake->keys.encKey, zeros,
25652565
AES_256_KEY_SIZE) != 0);
@@ -2620,7 +2620,7 @@ static void TestGenerateKeysSplit(void)
26202620
#endif /* !WOLFSSH_NO_AES_GCM */
26212621

26222622
#ifndef WOLFSSH_NO_AES_GCM
2623-
/* Sub-test C: aes256-gcm C2S (AEAD) / aes128-cbc S2C (non-AEAD) mirror.
2623+
/* Sub-test C: aes256-gcm C2S (AEAD) / aes128-cbc S2C (non-AEAD) -- mirror.
26242624
* Verifies that key 'E' is skipped (peerKeys.macKeySz==0) while key 'F'
26252625
* is generated for the non-AEAD S2C direction. */
26262626
ssh = wolfSSH_new(ctx);
@@ -2663,7 +2663,7 @@ static void TestGenerateKeysSplit(void)
26632663

26642664
wolfSSH_free(ssh);
26652665

2666-
/* Sub-test D: aes256-gcm C2S (AEAD) / aes256-gcm S2C (AEAD) symmetric.
2666+
/* Sub-test D: aes256-gcm C2S (AEAD) / aes256-gcm S2C (AEAD) -- symmetric.
26672667
* Both macKeySz==0; both key 'E' and key 'F' generation skipped.
26682668
* Directly validates the per-direction macKeySz>0 guards in GenerateKeys. */
26692669
ssh = wolfSSH_new(ctx);
@@ -2723,8 +2723,8 @@ static void TestGenerateKeysSplitClient(void)
27232723
ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_CLIENT, NULL);
27242724
AssertNotNull(ctx);
27252725

2726-
/* Sub-test A: aes128-cbc C2S / aes256-ctr S2C client mapping.
2727-
* Client: C2Skeys (local outgoing), S2CpeerKeys (peer outgoing). */
2726+
/* Sub-test A: aes128-cbc C2S / aes256-ctr S2C -- client mapping.
2727+
* Client: C2S->keys (local outgoing), S2C->peerKeys (peer outgoing). */
27282728
ssh = wolfSSH_new(ctx);
27292729
AssertNotNull(ssh);
27302730
AssertIntEQ(wolfSSH_SetAlgoListKex(ssh, FPF_KEX_GOOD), WS_SUCCESS);
@@ -2755,15 +2755,15 @@ static void TestGenerateKeysSplitClient(void)
27552755

27562756
AssertIntEQ(wolfSSH_TestGenerateKeys(ssh, ssh->handshake->kexHashId), WS_SUCCESS);
27572757

2758-
/* C2S direction (client: keys) aes128-cbc + hmac-sha1. */
2758+
/* C2S direction (client: keys) -- aes128-cbc + hmac-sha1. */
27592759
AssertIntEQ(ssh->handshake->keys.encKeySz, AES_128_KEY_SIZE);
27602760
AssertTrue(WMEMCMP(ssh->handshake->keys.encKey, zeros,
27612761
AES_128_KEY_SIZE) != 0);
27622762
AssertIntEQ(ssh->handshake->keys.macKeySz, WC_SHA_DIGEST_SIZE);
27632763
AssertTrue(WMEMCMP(ssh->handshake->keys.macKey, zeros,
27642764
WC_SHA_DIGEST_SIZE) != 0);
27652765

2766-
/* S2C direction (client: peerKeys) aes256-ctr + hmac-sha2-256. */
2766+
/* S2C direction (client: peerKeys) -- aes256-ctr + hmac-sha2-256. */
27672767
AssertIntEQ(ssh->handshake->peerKeys.encKeySz, AES_256_KEY_SIZE);
27682768
AssertTrue(WMEMCMP(ssh->handshake->peerKeys.encKey, zeros,
27692769
AES_256_KEY_SIZE) != 0);
@@ -2778,7 +2778,7 @@ static void TestGenerateKeysSplitClient(void)
27782778
wolfSSH_free(ssh);
27792779

27802780
#ifndef WOLFSSH_NO_AES_GCM
2781-
/* Sub-test B: aes128-cbc C2S (non-AEAD) / aes256-gcm S2C (AEAD) client.
2781+
/* Sub-test B: aes128-cbc C2S (non-AEAD) / aes256-gcm S2C (AEAD) -- client.
27822782
* keys.macKeySz must be set; peerKeys.macKeySz must be 0 (AEAD, no MAC). */
27832783
ssh = wolfSSH_new(ctx);
27842784
AssertNotNull(ssh);
@@ -2822,8 +2822,8 @@ static void TestGenerateKeysSplitClient(void)
28222822

28232823
wolfSSH_free(ssh);
28242824

2825-
/* Sub-test C: aes256-gcm C2S (AEAD) / aes128-cbc S2C (non-AEAD) mirror.
2826-
* Client: C2Skeys (local outgoing), S2CpeerKeys (peer outgoing).
2825+
/* Sub-test C: aes256-gcm C2S (AEAD) / aes128-cbc S2C (non-AEAD) -- mirror.
2826+
* Client: C2S->keys (local outgoing), S2C->peerKeys (peer outgoing).
28272827
* Verifies key 'E' skipped (keys.macKeySz==0) and key 'F' generated. */
28282828
ssh = wolfSSH_new(ctx);
28292829
AssertNotNull(ssh);
@@ -2865,7 +2865,7 @@ static void TestGenerateKeysSplitClient(void)
28652865

28662866
wolfSSH_free(ssh);
28672867

2868-
/* Sub-test D: aes256-gcm C2S (AEAD) / aes256-gcm S2C (AEAD) symmetric.
2868+
/* Sub-test D: aes256-gcm C2S (AEAD) / aes256-gcm S2C (AEAD) -- symmetric.
28692869
* Both macKeySz==0; both key 'E' and key 'F' generation skipped. */
28702870
ssh = wolfSSH_new(ctx);
28712871
AssertNotNull(ssh);
@@ -2921,7 +2921,7 @@ static void TestDoNewKeys(void)
29212921
byte expectedPeerAeadMode;
29222922
Keys savedPeerKeys;
29232923

2924-
/* Sub-test A: aes128-cbc C2S / aes256-ctr S2C non-AEAD both dirs.
2924+
/* Sub-test A: aes128-cbc C2S / aes256-ctr S2C -- non-AEAD both dirs.
29252925
* After DoNewKeys on the server, ssh->peer* must reflect the C2S (peer
29262926
* outgoing) direction, not the S2C (local outgoing) direction. */
29272927
ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_SERVER, NULL);
@@ -3031,8 +3031,8 @@ static void TestDoNewKeys(void)
30313031
wolfSSH_CTX_free(ctx);
30323032
#endif /* !WOLFSSH_NO_AES_GCM */
30333033

3034-
/* Sub-test C: client mirror of A aes128-cbc C2S / aes256-ctr S2C.
3035-
* Client: C2Skeys (local), S2CpeerKeys (peer). After DoNewKeys,
3034+
/* Sub-test C: client mirror of A -- aes128-cbc C2S / aes256-ctr S2C.
3035+
* Client: C2S->keys (local), S2C->peerKeys (peer). After DoNewKeys,
30363036
* ssh->peer* must reflect the S2C (server outgoing) direction. */
30373037
ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_CLIENT, NULL);
30383038
AssertNotNull(ctx);
@@ -3086,7 +3086,7 @@ static void TestDoNewKeys(void)
30863086
wolfSSH_CTX_free(ctx);
30873087

30883088
#ifndef WOLFSSH_NO_AES_GCM
3089-
/* Sub-test D: client mirror of B aes128-cbc C2S (non-AEAD) /
3089+
/* Sub-test D: client mirror of B -- aes128-cbc C2S (non-AEAD) /
30903090
* aes256-gcm S2C (AEAD). Verifies peerAeadMode==1 (S2C AEAD) rather
30913091
* than 0 (C2S non-AEAD), catching regression to handshake->aeadMode. */
30923092
ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_CLIENT, NULL);

0 commit comments

Comments
 (0)