Skip to content

Commit d180057

Browse files
authored
Update BoringSSL to 2fc6d38391cb76839c76b2a462619e7d69fd998d (#113)
1 parent 17d95a6 commit d180057

35 files changed

+11604
-3996
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// Sources/CCryptoBoringSSL directory. The source repository is at
2121
// https://boringssl.googlesource.com/boringssl.
2222
//
23-
// BoringSSL Commit: 8bbefbfeee609b17622deedd100163c12f5c95dc
23+
// BoringSSL Commit: 2fc6d38391cb76839c76b2a462619e7d69fd998d
2424

2525
import PackageDescription
2626

Sources/CCryptoBoringSSL/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ add_library(CCryptoBoringSSL STATIC
158158
"crypto/fipsmodule/ec/felem.c"
159159
"crypto/fipsmodule/ec/oct.c"
160160
"crypto/fipsmodule/ec/p224-64.c"
161-
"crypto/fipsmodule/ec/p256-x86_64.c"
161+
"crypto/fipsmodule/ec/p256-nistz.c"
162162
"crypto/fipsmodule/ec/p256.c"
163163
"crypto/fipsmodule/ec/scalar.c"
164164
"crypto/fipsmodule/ec/simple.c"
@@ -364,6 +364,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm
364364
crypto/fipsmodule/armv8-mont.ios.aarch64.S
365365
crypto/fipsmodule/ghash-neon-armv8.ios.aarch64.S
366366
crypto/fipsmodule/ghashv8-armx64.ios.aarch64.S
367+
crypto/fipsmodule/p256-armv8-asm.ios.aarch64.S
368+
crypto/fipsmodule/p256_beeu-armv8-asm.ios.aarch64.S
367369
crypto/fipsmodule/sha1-armv8.ios.aarch64.S
368370
crypto/fipsmodule/sha256-armv8.ios.aarch64.S
369371
crypto/fipsmodule/sha512-armv8.ios.aarch64.S
@@ -375,6 +377,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|Android" AND CMAKE_SYSTEM_PROCESSOR MATC
375377
crypto/fipsmodule/armv8-mont.linux.aarch64.S
376378
crypto/fipsmodule/ghash-neon-armv8.linux.aarch64.S
377379
crypto/fipsmodule/ghashv8-armx64.linux.aarch64.S
380+
crypto/fipsmodule/p256-armv8-asm.linux.aarch64.S
381+
crypto/fipsmodule/p256_beeu-armv8-asm.linux.aarch64.S
378382
crypto/fipsmodule/sha1-armv8.linux.aarch64.S
379383
crypto/fipsmodule/sha256-armv8.linux.aarch64.S
380384
crypto/fipsmodule/sha512-armv8.linux.aarch64.S

Sources/CCryptoBoringSSL/crypto/bio/printf.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,6 @@ int BIO_printf(BIO *bio, const char *format, ...) {
7171
va_start(args, format);
7272
out_len = vsnprintf(buf, sizeof(buf), format, args);
7373
va_end(args);
74-
75-
#if defined(OPENSSL_WINDOWS)
76-
// On Windows, vsnprintf returns -1 rather than the requested length on
77-
// truncation
78-
if (out_len < 0) {
79-
va_start(args, format);
80-
out_len = _vscprintf(format, args);
81-
va_end(args);
82-
assert(out_len >= (int)sizeof(buf));
83-
}
84-
#endif
85-
8674
if (out_len < 0) {
8775
return -1;
8876
}

Sources/CCryptoBoringSSL/crypto/curve25519/curve25519.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
// Various pre-computed constants.
3737
#include "./curve25519_tables.h"
3838

39+
#if defined(OPENSSL_NO_ASM)
40+
#define FIAT_25519_NO_ASM
41+
#endif
42+
3943
#if defined(BORINGSSL_CURVE25519_64BIT)
4044
#include "../../third_party/fiat/curve25519_64.h"
4145
#else

0 commit comments

Comments
 (0)