Skip to content

Commit 2b5fb50

Browse files
committed
Revert GCC-12 workarounds that don't seem to be required anymore
1 parent 5902f03 commit 2b5fb50

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

crypto/x509/v3_utl.c

-16
Original file line numberDiff line numberDiff line change
@@ -1288,25 +1288,9 @@ static int ipv6_from_asc(uint8_t v6[16], const char *in) {
12881288

12891289
// Format the result.
12901290
if (v6stat.zero_pos >= 0) {
1291-
// Due to the gcc-12 workaround parsing is broke for the IPv6 address
1292-
// `::` which would have been previously supported and working.
1293-
// This variant is checked earlier, so total here can't be anything
1294-
// other then zero if the count was 3.
1295-
// if(v6stat.zero_cnt == 3) {
1296-
// OPENSSL_memset(v6, 0, 16);
1297-
// return 1;
1298-
// }
1299-
13001291
// Copy initial part
13011292
OPENSSL_memcpy(v6, v6stat.tmp, v6stat.zero_pos);
1302-
13031293
// Zero middle
1304-
// This condition is to suppress gcc-12 warning.
1305-
// https://github.com/aws/aws-lc/issues/487
1306-
// if (v6stat.zero_pos > v6stat.total) {
1307-
// // This should not happen.
1308-
// return 0;
1309-
// }
13101294
OPENSSL_memset(v6 + v6stat.zero_pos, 0, 16 - v6stat.total);
13111295
// Copy final part
13121296
if (v6stat.total != v6stat.zero_pos) {

0 commit comments

Comments
 (0)