summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/defaults/CC/TARGETS.boringssl97
-rw-r--r--etc/import/TARGETS.boringssl35
-rw-r--r--etc/import/src/include/openssl/TARGETS.boringssl13
-rw-r--r--etc/repos.json10
4 files changed, 126 insertions, 29 deletions
diff --git a/etc/defaults/CC/TARGETS.boringssl b/etc/defaults/CC/TARGETS.boringssl
index bb164ad9..19106589 100644
--- a/etc/defaults/CC/TARGETS.boringssl
+++ b/etc/defaults/CC/TARGETS.boringssl
@@ -43,10 +43,101 @@
, "-Wmissing-field-initializers"
, "-Wwrite-strings"
, "-Wshadow"
- , "-Wno-unknown-warning-option"
- , "-Wno-array-parameter"
- , "-Wno-unused-but-set-variable"
, "-fno-common"
+ , "-Wmissing-prototypes"
+ , "-Wold-style-definition"
+ , "-Wstrict-prototypes"
+ ]
+ ]
+ ]
+ , "body":
+ { "type": "++"
+ , "$1":
+ [ { "type": "case"
+ , "expr":
+ { "type": "var"
+ , "name": "TARGET_ARCH"
+ , "default": {"type": "var", "name": "ARCH"}
+ }
+ , "case": {"arm": ["-Wno-atomic-alignment"]}
+ }
+ , { "type": "cond"
+ , "cond":
+ [ [ { "type": "or"
+ , "$1":
+ [ { "type": "=="
+ , "$1": {"type": "var", "name": "PLATFORM"}
+ , "$2": "linux_ppc64le"
+ }
+ , { "type": "=="
+ , "$1": {"type": "var", "name": "PLATFORM"}
+ , "$2": "linux_x86_64"
+ }
+ , { "type": "=="
+ , "$1": {"type": "var", "name": "PLATFORM"}
+ , "$2": "mac_x86_64"
+ }
+ ]
+ }
+ , {"type": "var", "name": "posix_copts"}
+ ]
+ , [ { "type": "=="
+ , "$1": {"type": "var", "name": "PLATFORM"}
+ , "$2": "windows_x86_64"
+ }
+ , ["-DWIN32_LEAN_AND_MEAN", "-DOPENSSL_NO_ASM"]
+ ]
+ ]
+ , "default": ["-DOPENSSL_NO_ASM"]
+ }
+ ]
+ }
+ }
+ ]
+ }
+ , "ADD_CXXFLAGS":
+ { "type": "++"
+ , "$1":
+ [ ["-std=c++20"]
+ , { "type": "let*"
+ , "bindings":
+ [ [ "OS"
+ , { "type": "var"
+ , "name": "OS"
+ , "default":
+ {"type": "fail", "msg": "Required variable 'OS' is not set."}
+ }
+ ]
+ , [ "ARCH"
+ , { "type": "var"
+ , "name": "ARCH"
+ , "default":
+ {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
+ }
+ ]
+ , [ "PLATFORM"
+ , { "type": "join"
+ , "separator": "_"
+ , "$1":
+ [ {"type": "var", "name": "OS"}
+ , { "type": "var"
+ , "name": "TARGET_ARCH"
+ , "default": {"type": "var", "name": "ARCH"}
+ }
+ ]
+ }
+ ]
+ , [ "posix_copts"
+ , [ "-Wa,--noexecstack"
+ , "-D_XOPEN_SOURCE=700"
+ , "-Wall"
+ , "-Wformat=2"
+ , "-Wsign-compare"
+ , "-Wmissing-field-initializers"
+ , "-Wwrite-strings"
+ , "-Wshadow"
+ , "-fno-common"
+ , "-Wmissing-declarations"
]
]
]
diff --git a/etc/import/TARGETS.boringssl b/etc/import/TARGETS.boringssl
index 2c117f4c..62defd2e 100644
--- a/etc/import/TARGETS.boringssl
+++ b/etc/import/TARGETS.boringssl
@@ -54,7 +54,6 @@
{ "type": ["@", "rules", "CC", "library"]
, "name": ["crypto"]
, "pkg-name": ["libcrypto"]
- , "cflags": ["-Wno-gnu-anonymous-struct", "-Wno-nested-anon-types"]
, "hdrs": [["./", "src/include/openssl", "crypto_headers"]]
, "private-hdrs": ["fips_fragments", "crypto_internal_headers"]
, "srcs": ["crypto_sources", "crypto_sources_asm"]
@@ -73,7 +72,8 @@
, "crypto_internal_headers":
{ "type": "install"
, "deps":
- [ "src/crypto/asn1/asn1_locl.h"
+ [ "src/crypto/asn1/charmap.h"
+ , "src/crypto/asn1/internal.h"
, "src/crypto/bio/internal.h"
, "src/crypto/bytestring/internal.h"
, "src/crypto/chacha/internal.h"
@@ -83,6 +83,7 @@
, "src/crypto/cpu-arm-linux.h"
, "src/crypto/curve25519/curve25519_tables.h"
, "src/crypto/curve25519/internal.h"
+ , "src/crypto/dsa/internal.h"
, "src/crypto/ec_extra/internal.h"
, "src/crypto/err/internal.h"
, "src/crypto/evp/internal.h"
@@ -98,6 +99,7 @@
, "src/crypto/fipsmodule/ec/p256-x86_64-table.h"
, "src/crypto/fipsmodule/ec/p256-x86_64.h"
, "src/crypto/fipsmodule/ec/p256_table.h"
+ , "src/crypto/fipsmodule/ecdsa/internal.h"
, "src/crypto/fipsmodule/md5/internal.h"
, "src/crypto/fipsmodule/modes/internal.h"
, "src/crypto/fipsmodule/rand/fork_detect.h"
@@ -108,18 +110,16 @@
, "src/crypto/fipsmodule/tls/internal.h"
, "src/crypto/hrss/internal.h"
, "src/crypto/internal.h"
+ , "src/crypto/lhash/internal.h"
, "src/crypto/obj/obj_dat.h"
, "src/crypto/pkcs7/internal.h"
, "src/crypto/pkcs8/internal.h"
, "src/crypto/poly1305/internal.h"
, "src/crypto/pool/internal.h"
, "src/crypto/trust_token/internal.h"
- , "src/crypto/x509/charmap.h"
, "src/crypto/x509/internal.h"
- , "src/crypto/x509/vpm_int.h"
, "src/crypto/x509v3/ext_dat.h"
, "src/crypto/x509v3/internal.h"
- , "src/crypto/x509v3/pcy_int.h"
, "src/third_party/fiat/curve25519_32.h"
, "src/third_party/fiat/curve25519_64.h"
, "src/third_party/fiat/p256_32.h"
@@ -142,6 +142,7 @@
, "src/crypto/asn1/a_object.c"
, "src/crypto/asn1/a_octet.c"
, "src/crypto/asn1/a_print.c"
+ , "src/crypto/asn1/a_strex.c"
, "src/crypto/asn1/a_strnid.c"
, "src/crypto/asn1/a_time.c"
, "src/crypto/asn1/a_type.c"
@@ -150,7 +151,6 @@
, "src/crypto/asn1/asn1_lib.c"
, "src/crypto/asn1/asn1_par.c"
, "src/crypto/asn1/asn_pack.c"
- , "src/crypto/asn1/f_enum.c"
, "src/crypto/asn1/f_int.c"
, "src/crypto/asn1/f_string.c"
, "src/crypto/asn1/tasn_dec.c"
@@ -171,6 +171,7 @@
, "src/crypto/bio/printf.c"
, "src/crypto/bio/socket.c"
, "src/crypto/bio/socket_helper.c"
+ , "src/crypto/blake2/blake2.c"
, "src/crypto/bn_extra/bn_asn1.c"
, "src/crypto/bn_extra/convert.c"
, "src/crypto/buf/buf.c"
@@ -195,6 +196,7 @@
, "src/crypto/conf/conf.c"
, "src/crypto/cpu-aarch64-fuchsia.c"
, "src/crypto/cpu-aarch64-linux.c"
+ , "src/crypto/cpu-aarch64-win.c"
, "src/crypto/cpu-arm-linux.c"
, "src/crypto/cpu-arm.c"
, "src/crypto/cpu-intel.c"
@@ -202,10 +204,8 @@
, "src/crypto/crypto.c"
, "src/crypto/curve25519/curve25519.c"
, "src/crypto/curve25519/spake25519.c"
- , "src/crypto/dh/check.c"
- , "src/crypto/dh/dh.c"
- , "src/crypto/dh/dh_asn1.c"
- , "src/crypto/dh/params.c"
+ , "src/crypto/dh_extra/dh_asn1.c"
+ , "src/crypto/dh_extra/params.c"
, "src/crypto/digest_extra/digest_extra.c"
, "src/crypto/dsa/dsa.c"
, "src/crypto/dsa/dsa_asn1.c"
@@ -236,8 +236,8 @@
, "src/crypto/ex_data.c"
, "src/crypto/fipsmodule/bcm.c"
, "src/crypto/fipsmodule/fips_shared_support.c"
- , "src/crypto/fipsmodule/is_fips.c"
, "src/crypto/hkdf/hkdf.c"
+ , "src/crypto/hpke/hpke.c"
, "src/crypto/hrss/hrss.c"
, "src/crypto/lhash/lhash.c"
, "src/crypto/mem.c"
@@ -263,6 +263,7 @@
, "src/crypto/rand_extra/deterministic.c"
, "src/crypto/rand_extra/forkunsafe.c"
, "src/crypto/rand_extra/fuchsia.c"
+ , "src/crypto/rand_extra/passive.c"
, "src/crypto/rand_extra/rand_extra.c"
, "src/crypto/rand_extra/windows.c"
, "src/crypto/rc4/rc4.c"
@@ -278,15 +279,16 @@
, "src/crypto/thread_win.c"
, "src/crypto/trust_token/pmbtoken.c"
, "src/crypto/trust_token/trust_token.c"
+ , "src/crypto/trust_token/voprf.c"
, "src/crypto/x509/a_digest.c"
, "src/crypto/x509/a_sign.c"
- , "src/crypto/x509/a_strex.c"
, "src/crypto/x509/a_verify.c"
, "src/crypto/x509/algorithm.c"
, "src/crypto/x509/asn1_gen.c"
, "src/crypto/x509/by_dir.c"
, "src/crypto/x509/by_file.c"
, "src/crypto/x509/i2d_pr.c"
+ , "src/crypto/x509/name_print.c"
, "src/crypto/x509/rsa_pss.c"
, "src/crypto/x509/t_crl.c"
, "src/crypto/x509/t_req.c"
@@ -300,7 +302,6 @@
, "src/crypto/x509/x509_ext.c"
, "src/crypto/x509/x509_lu.c"
, "src/crypto/x509/x509_obj.c"
- , "src/crypto/x509/x509_r2x.c"
, "src/crypto/x509/x509_req.c"
, "src/crypto/x509/x509_set.c"
, "src/crypto/x509/x509_trs.c"
@@ -353,12 +354,10 @@
, "src/crypto/x509v3/v3_pci.c"
, "src/crypto/x509v3/v3_pcia.c"
, "src/crypto/x509v3/v3_pcons.c"
- , "src/crypto/x509v3/v3_pku.c"
, "src/crypto/x509v3/v3_pmaps.c"
, "src/crypto/x509v3/v3_prn.c"
, "src/crypto/x509v3/v3_purp.c"
, "src/crypto/x509v3/v3_skey.c"
- , "src/crypto/x509v3/v3_sxnet.c"
, "src/crypto/x509v3/v3_utl.c"
]
}
@@ -395,6 +394,8 @@
, "src/crypto/fipsmodule/cipher/e_aes.c"
, "src/crypto/fipsmodule/cipher/e_des.c"
, "src/crypto/fipsmodule/des/des.c"
+ , "src/crypto/fipsmodule/dh/check.c"
+ , "src/crypto/fipsmodule/dh/dh.c"
, "src/crypto/fipsmodule/digest/digest.c"
, "src/crypto/fipsmodule/digest/digests.c"
, "src/crypto/fipsmodule/ec/ec.c"
@@ -430,6 +431,7 @@
, "src/crypto/fipsmodule/rsa/padding.c"
, "src/crypto/fipsmodule/rsa/rsa.c"
, "src/crypto/fipsmodule/rsa/rsa_impl.c"
+ , "src/crypto/fipsmodule/self_check/fips.c"
, "src/crypto/fipsmodule/self_check/self_check.c"
, "src/crypto/fipsmodule/sha/sha1-altivec.c"
, "src/crypto/fipsmodule/sha/sha1.c"
@@ -683,6 +685,8 @@
, "src/ssl/d1_srtp.cc"
, "src/ssl/dtls_method.cc"
, "src/ssl/dtls_record.cc"
+ , "src/ssl/encrypted_client_hello.cc"
+ , "src/ssl/extensions.cc"
, "src/ssl/handoff.cc"
, "src/ssl/handshake.cc"
, "src/ssl/handshake_client.cc"
@@ -705,7 +709,6 @@
, "src/ssl/ssl_versions.cc"
, "src/ssl/ssl_x509.cc"
, "src/ssl/t1_enc.cc"
- , "src/ssl/t1_lib.cc"
, "src/ssl/tls13_both.cc"
, "src/ssl/tls13_client.cc"
, "src/ssl/tls13_enc.cc"
diff --git a/etc/import/src/include/openssl/TARGETS.boringssl b/etc/import/src/include/openssl/TARGETS.boringssl
index 4b2ae6f8..c84392a3 100644
--- a/etc/import/src/include/openssl/TARGETS.boringssl
+++ b/etc/import/src/include/openssl/TARGETS.boringssl
@@ -5,11 +5,12 @@
, "aes.h"
, "arm_arch.h"
, "asn1.h"
- , "asn1_mac.h"
, "asn1t.h"
+ , "asn1_mac.h"
, "base.h"
, "base64.h"
, "bio.h"
+ , "blake2.h"
, "blowfish.h"
, "bn.h"
, "buf.h"
@@ -27,17 +28,19 @@
, "dh.h"
, "digest.h"
, "dsa.h"
- , "e_os2.h"
, "ec.h"
- , "ec_key.h"
, "ecdh.h"
, "ecdsa.h"
+ , "ec_key.h"
, "engine.h"
, "err.h"
, "evp.h"
+ , "evp_errors.h"
, "ex_data.h"
+ , "e_os2.h"
, "hkdf.h"
, "hmac.h"
+ , "hpke.h"
, "hrss.h"
, "is_boringssl.h"
, "lhash.h"
@@ -46,8 +49,8 @@
, "mem.h"
, "nid.h"
, "obj.h"
- , "obj_mac.h"
, "objects.h"
+ , "obj_mac.h"
, "opensslconf.h"
, "opensslv.h"
, "ossl_typ.h"
@@ -70,8 +73,8 @@
, "trust_token.h"
, "type_check.h"
, "x509.h"
- , "x509_vfy.h"
, "x509v3.h"
+ , "x509_vfy.h"
]
, "stage": ["openssl"]
}
diff --git a/etc/repos.json b/etc/repos.json
index 0d78075a..f2ed4c19 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -201,11 +201,11 @@
, "ssl":
{ "repository":
{ "type": "archive"
- , "content": "cdf51ff27d78e1aceb7cc01d03f9a115826501be"
- , "fetch": "https://github.com/google/boringssl/archive/e8a935e323510419e0b37638716f6df4dcbbe6f6.tar.gz"
- , "sha256": "5bbb2bbddf5e4e5fefd02501f930436f3f45402152d7ea9f8f27916d5cf70157"
- , "sha512": "c1cb6a94b967985e05c699ff73d1e6aebba27903d771c58008cedbbdead53eda33e112de10691af7471e823013afada466ea1abb420a3d55cfd8e2a4b09effed"
- , "subdir": "boringssl-e8a935e323510419e0b37638716f6df4dcbbe6f6"
+ , "content": "19cdde8ba529848172c09e84e3deb2c92dc670c3"
+ , "fetch": "https://github.com/google/boringssl/archive/6195bf8242156c9a2fa75702eee058f91b86a88b.tar.gz"
+ , "sha256": "ad0b806b6c5cbd6cae121c608945d5fed468748e330632e8d53315089ad52c67"
+ , "sha512": "bd0ff23103695a08c5072ef4e88042c32b684295ee6434124d9c9292586b72863c35246cd8002ad3de3a79a9dfe10a1e0beb594c1625bdf1d6f6175821ca75a1"
+ , "subdir": "boringssl-6195bf8242156c9a2fa75702eee058f91b86a88b"
}
, "target_root": "import targets"
, "target_file_name": "TARGETS.boringssl"
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 08:52:43 +0000