Version in base suite: 21.0.12.1+1-1~deb13u1 Version in overlay suite: 21.0.13+9-1~deb13u2 Base version: openjdk-21_21.0.13+9-1~deb13u2 Target version: openjdk-21_21.0.13.1+2-1~deb13u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/o/openjdk-21/openjdk-21_21.0.13+9-1~deb13u2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/o/openjdk-21/openjdk-21_21.0.13.1+2-1~deb13u1.dsc .jcheck/conf | 2 debian/changelog | 35 debian/copyright | 2 debian/dbg.py | 95 - debian/rules | 2 make/conf/version-numbers.conf | 4 make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java | 41 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp | 4 src/hotspot/share/opto/c2compiler.cpp | 8 src/hotspot/share/opto/loopnode.cpp | 10 src/java.base/share/classes/java/lang/AbstractStringBuilder.java | 54 src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java | 11 src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java | 11 src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java | 11 src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java | 12 src/java.base/share/conf/security/java.security | 33 src/java.base/share/data/blockedcertsconverter/blocked.certs.pem | 430 +++++ src/java.base/share/data/cacerts/comodoaaaca | 32 src/java.base/share/data/cacerts/emsigneccrootcag3 | 22 src/java.base/share/data/cacerts/emsignrootcag1 | 29 src/java.base/share/data/cacerts/emsignrootcag2 | 39 src/java.base/share/data/tzdata/VERSION | 2 src/java.base/share/data/tzdata/leapseconds | 24 src/java.base/share/data/tzdata/northamerica | 73 src/java.base/share/data/tzdata/southamerica | 35 src/java.base/share/data/tzdata/zone.tab | 2 src/java.desktop/share/legal/freetype.md | 2 src/java.desktop/share/legal/libpng.md | 4 src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h | 1 src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h | 38 src/java.desktop/share/native/libfreetype/include/freetype/freetype.h | 15 src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h | 4 src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h | 1 src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h | 2 src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h | 4 src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h | 1 src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h | 7 src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h | 4 src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h | 29 src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h | 6 src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h | 1 src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h | 3 src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h | 107 + src/java.desktop/share/native/libfreetype/include/freetype/tttags.h | 12 src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c | 8 src/java.desktop/share/native/libfreetype/src/autofit/afranges.c | 17 src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c | 48 src/java.desktop/share/native/libfreetype/src/base/ftbbox.c | 9 src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c | 265 +-- src/java.desktop/share/native/libfreetype/src/base/ftcalc.c | 25 src/java.desktop/share/native/libfreetype/src/base/ftobjs.c | 233 +- src/java.desktop/share/native/libfreetype/src/base/ftoutln.c | 102 + src/java.desktop/share/native/libfreetype/src/base/ftstroke.c | 55 src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c | 142 + src/java.desktop/share/native/libfreetype/src/cff/cffgload.c | 76 src/java.desktop/share/native/libfreetype/src/cff/cffload.c | 6 src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c | 8 src/java.desktop/share/native/libfreetype/src/cid/cidload.c | 14 src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c | 30 src/java.desktop/share/native/libfreetype/src/psaux/psstack.c | 13 src/java.desktop/share/native/libfreetype/src/raster/ftraster.c | 93 - src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c | 200 ++ src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c | 8 src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c | 820 +++++++++- src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h | 14 src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h | 4 src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c | 101 - src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c | 59 src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c | 91 - src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c | 12 src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c | 14 src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c | 234 +- src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c | 18 src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c | 88 - src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c | 131 + src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c | 639 +++++-- src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h | 17 src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c | 343 ++-- src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h | 8 src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c | 78 src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h | 16 src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c | 15 src/java.desktop/share/native/libfreetype/src/type1/t1load.c | 11 src/java.desktop/share/native/libfreetype/src/type1/t1parse.c | 56 src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java | 83 + src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java | 81 src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java | 3 src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java | 20 src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java | 11 src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java | 183 -- src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventWriter.java | 9 test/hotspot/jtreg/ProblemList.txt | 2 test/hotspot/jtreg/compiler/loopopts/TestTruncationWrapPhiTypeUnion.java | 221 ++ test/jdk/java/util/TimeZone/TimeZoneData/VERSION | 2 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java | 29 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java | 179 -- test/jdk/sun/security/krb5/ErrorMessages.java | 63 test/jdk/sun/security/krb5/auto/KDC.java | 14 test/jdk/sun/security/lib/CheckBlockedCerts.java | 16 test/jdk/sun/security/lib/cacerts/VerifyCACerts.java | 13 test/micro/org/openjdk/bench/java/lang/StringBuilders.java | 50 101 files changed, 4736 insertions(+), 1628 deletions(-) dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpdu4a3cqs/openjdk-21_21.0.13+9-1~deb13u2.dsc: no acceptable signature found dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpdu4a3cqs/openjdk-21_21.0.13.1+2-1~deb13u1.dsc: no acceptable signature found diff -Nru openjdk-21-21.0.13+9/.jcheck/conf openjdk-21-21.0.13.1+2/.jcheck/conf --- openjdk-21-21.0.13+9/.jcheck/conf 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/.jcheck/conf 2026-11-15 23:20:43.000000000 +0000 @@ -1,7 +1,7 @@ [general] project=jdk-updates jbs=JDK -version=21.0.13 +version=21.0.13.1 [checks] error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists diff -Nru openjdk-21-21.0.13+9/debian/changelog openjdk-21-21.0.13.1+2/debian/changelog --- openjdk-21-21.0.13+9/debian/changelog 2026-10-24 19:08:21.000000000 +0000 +++ openjdk-21-21.0.13.1+2/debian/changelog 2026-11-18 10:36:52.000000000 +0000 @@ -1,9 +1,36 @@ -openjdk-21 (21.0.13+9-1~deb13u2) trixie-security; urgency=medium +openjdk-21 (21.0.13.1+2-1~deb13u1) trixie-security; urgency=medium - * Rebuild for trixie, this time against jtreg 8.3 (now backported to - trixie-security as well) + * Rebuild for trixie - -- Moritz Muehlenhoff Sat, 24 Oct 2026 21:08:21 +0200 + -- Moritz Muehlenhoff Wed, 18 Nov 2026 11:36:52 +0100 + +openjdk-21 (21.0.13.1+2-1) unstable; urgency=medium + + * OpenJDK 21.0.13.1 release, build2. + + CVEs: + + CVE-2026-114938 + + CVE-2026-114939 + + CVE-2026-114940 + + CVE-2026-114941 + + CVE-2026-114942 + + CVE-2026-114943 + + CVE-2026-114944 + + CVE-2026-114945 + + CVE-2026-114946 + * d/dbg.py: gdb stack unwinder introduces significant delays when + debuginfod is enabled processing the first stack. Disable gdb stack + unwinder by default, add sanity checks. + * d/copyright: Regenerate. + + -- Vladimir Petko Sat, 14 Nov 2026 09:44:28 +1300 + +openjdk-21 (21.0.13.0.3+1-1) unstable; urgency=medium + + * OpenJDK 21.0.13.0.3 release, build 1. + - CVEs: + + CVE-2026-91403: JDK-8395690: CA certificate improvements. + + -- Vladimir Petko Thu, 29 Oct 2026 08:24:16 -0500 openjdk-21 (21.0.13+9-1) unstable; urgency=medium diff -Nru openjdk-21-21.0.13+9/debian/copyright openjdk-21-21.0.13.1+2/debian/copyright --- openjdk-21-21.0.13+9/debian/copyright 2026-10-22 01:18:55.000000000 +0000 +++ openjdk-21-21.0.13.1+2/debian/copyright 2026-11-13 20:44:28.000000000 +0000 @@ -2957,7 +2957,7 @@ --- end of LICENSE --- . ------------------------------------------------------------------------------ - %% This notice is provided with respect to The FreeType Project: Freetype v2.14.3, + %% This notice is provided with respect to The FreeType Project: Freetype v2.15.0, which may be included with JRE 21, JDK 21 and OpenJDK 21 . --- begin of LICENSE --- diff -Nru openjdk-21-21.0.13+9/debian/dbg.py openjdk-21-21.0.13.1+2/debian/dbg.py --- openjdk-21-21.0.13+9/debian/dbg.py 2026-10-22 01:18:55.000000000 +0000 +++ openjdk-21-21.0.13.1+2/debian/dbg.py 2026-11-13 20:44:28.000000000 +0000 @@ -283,19 +283,20 @@ t("if cls.lo == 0 or cls.hi == 0:") if cls.lo == 0 or cls.hi == 0: try: + # Ensure we can find both bounds t("cls.lo = gdb.parse_and_eval(\"CodeCache::_low_bound\")") - lo = gdb.parse_and_eval("CodeCache::_low_bound") - cls.lo = Types.as_long(lo) - debug("@@ CodeCache::_low_bound = 0x%x\n" % cls.lo) - if cls.lo == 0: + lo = Types.as_long(gdb.parse_and_eval("CodeCache::_low_bound")) + debug("@@ CodeCache::_low_bound = 0x%x\n" % lo) + if lo == 0: return t("cls.hi = gdb.parse_and_eval(\"CodeCache::_high_bound\")") - hi = gdb.parse_and_eval("CodeCache::_high_bound") - cls.hi = Types.as_long(hi) - debug("@@ CodeCache::_high_bound = 0x%x\n" % cls.hi) - if cls.hi == 0: + hi = Types.as_long(gdb.parse_and_eval("CodeCache::_high_bound")) + debug("@@ CodeCache::_high_bound = 0x%x\n" % hi) + if hi == 0: return - except Exception as arg: + cls.lo = lo + cls.hi = hi + except BaseException as arg: debug("@@ %s\n" % arg) cls.lo = 0 cls.hi = 0 @@ -314,15 +315,17 @@ t("data = heaps['_data']") data = heaps['_data'] debug("@@ CodeCache::_heaps->_data = 0x%x\n" % data) + # Ensure we append heap list only if all heaps are populated + heap_list = [] t("for i in range(0, len):") for i in range(0, len): t("heap = CodeHeap((data + i).dereference())") heap = CodeHeap((data + i).dereference()) t("cls.heap_list.append(heap)") - cls.heap_list.append(heap) - t("cls.heap_count += 1") - cls.heap_count += 1 - except Exception as arg: + heap_list.append(heap) + cls.heap_list = heap_list + cls.heap_count = len + except BaseException as arg: debug("@@ %s\n" % arg) cls.heap_list = [] cls.heap_count = 0 @@ -781,7 +784,8 @@ self.enabled = False self.priority = 100 self.unwinder = unwinder - self.unwinder.set_filter(self) + if self.unwinder is not None: + self.unwinder.set_filter(self) def maybe_wrap_frame(self, frame): t("OpenJDKFrameFilter.maybe_wrap_frame") @@ -1068,6 +1072,8 @@ def __init__(self): t("OpenJDKUnwinder.__init__") super(OpenJDKUnwinder, self).__init__("OpenJDKUnwinder") + self._enabled = False + self.filter = None # blob name will be in format '0xHexDigits "AlphaNumSpaces"' self.matcher=re.compile('^0x[a-fA-F0-9]+ "(.*)"$') self.unwindercache = {} @@ -1083,10 +1089,12 @@ # Intercept when the user runs `enable/disable unwinder` @enabled.setter def enabled(self, value): + if not isinstance(value, bool): + raise TypeError("incorrect type for enabled attribute: %s" % type(value)) self._enabled = value - - if self.filter and value: + if self.filter is not None: self.filter.enabled = value + gdb.invalidate_cached_frames() # the method that gets called by the pyuw_sniffer def __call__(self, pending_frame): @@ -1103,15 +1111,13 @@ try: debug("!!! blocking %s !!!\n" % str(thread)) self.invocations[thread] = thread - result = self.call_sub(pending_frame) - debug("!!! unblocking %s !!!\n" % str(thread)) - self.invocations[thread] = None - return result + return self.call_sub(pending_frame) except Exception as arg: debug("!!! __call__ oops %s !!!\n" % arg) + return None + finally: debug("!!! unblocking %s !!!\n" % str(thread)) self.invocations[thread] = None - return None def call_sub(self, pending_frame): t("OpenJDKUnwinder.__call_sub__") @@ -1197,25 +1203,40 @@ codetype = "stub" else: debug("@@ unknown %s\n" % name) - codetype = "unknown" - # cache details of the current frame + # Do not try to unwind unknown frame types + return None x = Types.as_long(sp) + bp_val = Types.as_long(bp) + # sanity check that bp lies in the current stack frame above sp + if bp_val < x or (bp_val - x) >= 0x200000 or (bp_val & 0x7) != 0: + debug("@@ invalid bp 0x%x for sp 0x%x\n" % (bp_val, x)) + return None + try: + t("next_bp = Types.load_long(bp)") + next_bp = Types.load_long(bp) + t("next_pc = Types.load_long(bp + 8)") + next_pc = Types.load_long(bp + 8) + # next_sp is normally just 2 words below current bp + # but for interpreted frames we need to skip locals + # so we pull caller_sp from the frame + if codetype == "interpreted": + interpreter_frame_sender_sp_offset = FrameConstants.interpreter_frame_sender_sp_offset() * 8 + # interpreter frames store sender sp in slot 1 + next_sp = Types.load_long(bp + interpreter_frame_sender_sp_offset) + else: + sender_sp_offset = FrameConstants.sender_sp_offset() * 8 + next_sp = bp + sender_sp_offset + # verify next_sp advances up the stack and next_pc points to mapped memory + if Types.as_long(next_sp) <= x or Types.as_long(next_pc) == 0: + debug("@@ invalid next_sp 0x%x or next_pc 0x%x\n" % (Types.as_long(next_sp), Types.as_long(next_pc))) + return None + Types.load_byte(next_pc) + except gdb.MemoryError as arg: + debug("@@ memory error unwinding frame: %s\n" % arg) + return None + # cache details of the current frame debug("@@ add %s cache entry for blob 0x%x at unwindercache[0x%x]\n" % (codetype, blob, x)) self.unwindercache[x] = OpenJDKUnwinderCacheEntry(blob, sp, pc, bp, bcp, name, codetype) - t("next_bp = Types.load_long(bp)") - next_bp = Types.load_long(bp) - t("next_pc = Types.load_long(bp + 8)") - next_pc = Types.load_long(bp + 8) - # next_sp is normally just 2 words below current bp - # but for interpreted frames we need to skip locals - # so we pull caller_sp from the frame - if codetype == "interpreted": - interpreter_frame_sender_sp_offset = FrameConstants.interpreter_frame_sender_sp_offset() * 8 - # interpreter frames store sender sp in slot 1 - next_sp = Types.load_long(bp + interpreter_frame_sender_sp_offset) - else: - sender_sp_offset = FrameConstants.sender_sp_offset() * 8 - next_sp = bp + sender_sp_offset # create unwind info for this frame t("frameid = OpenJDKFrameId(...)") frameid = OpenJDKFrameId(Types.to_voidp(next_sp), diff -Nru openjdk-21-21.0.13+9/debian/rules openjdk-21-21.0.13.1+2/debian/rules --- openjdk-21-21.0.13+9/debian/rules 2026-10-22 01:18:55.000000000 +0000 +++ openjdk-21-21.0.13.1+2/debian/rules 2026-11-13 20:44:28.000000000 +0000 @@ -2107,7 +2107,7 @@ dh_builddeb -a $(nodemo) $(nojrez) #$(bd_options) git_project = jdk21u -git_tag = jdk-21.0.13+9 +git_tag = jdk-21.0.13.1+2 package_version = $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//') ifneq ($(is_upstream_release),yes) package_version := $(subst +,~,$(package_version)) diff -Nru openjdk-21-21.0.13+9/make/conf/version-numbers.conf openjdk-21-21.0.13.1+2/make/conf/version-numbers.conf --- openjdk-21-21.0.13+9/make/conf/version-numbers.conf 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/make/conf/version-numbers.conf 2026-11-15 23:20:43.000000000 +0000 @@ -29,11 +29,11 @@ DEFAULT_VERSION_FEATURE=21 DEFAULT_VERSION_INTERIM=0 DEFAULT_VERSION_UPDATE=13 -DEFAULT_VERSION_PATCH=0 +DEFAULT_VERSION_PATCH=1 DEFAULT_VERSION_EXTRA1=0 DEFAULT_VERSION_EXTRA2=0 DEFAULT_VERSION_EXTRA3=0 -DEFAULT_VERSION_DATE=2026-10-20 +DEFAULT_VERSION_DATE=2026-11-17 DEFAULT_VERSION_CLASSFILE_MAJOR=65 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" DEFAULT_VERSION_CLASSFILE_MINOR=0 DEFAULT_VERSION_DOCS_API_SINCE=11 diff -Nru openjdk-21-21.0.13+9/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java openjdk-21-21.0.13.1+2/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java --- openjdk-21-21.0.13+9/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/make/jdk/src/classes/build/tools/blockedcertsconverter/BlockedCertsConverter.java 2026-11-15 23:20:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,12 +27,14 @@ import java.io.IOException; import java.math.BigInteger; +import java.security.AlgorithmParameters; +import java.security.GeneralSecurityException; import java.security.MessageDigest; -import java.security.PublicKey; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.security.interfaces.ECPublicKey; +import java.security.spec.ECGenParameterSpec; +import java.security.spec.ECParameterSpec; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -140,11 +142,8 @@ List algIds = Arrays.asList(seq[1], altAlgId(seq[1])); List sigs; - PublicKey p = c.getPublicKey(); - if (p instanceof ECPublicKey) { - ECPublicKey ep = (ECPublicKey) p; - BigInteger mod = ep.getParams().getOrder(); - sigs = Arrays.asList(seq[2], altSig(mod, seq[2])); + if (c.getSigAlgName().contains("ECDSA")) { + sigs = Arrays.asList(seq[2], altSig(seq[2])); } else { sigs = Arrays.asList(seq[2]); } @@ -163,14 +162,27 @@ return result; } - private static DerValue altSig(BigInteger mod, DerValue sig) + private static DerValue altSig(DerValue sig) throws IOException { byte[] sigBits = sig.getBitString(); + int sigLength = sigBits.length; DerInputStream in = - new DerInputStream(sigBits, 0, sigBits.length, false); + new DerInputStream(sigBits, 0, sigLength, false); DerValue[] values = in.getSequence(2); BigInteger r = values[0].getBigInteger(); BigInteger s = values[1].getBigInteger(); + BigInteger mod; + // The following checks cover more than 99.99999% of signature lengths + // for the three NIST-P curves. Fail if the length lies outside. + if (sigLength >= 100 && sigLength <= 104) { + mod = order("secp384r1"); + } else if (sigLength >= 68 && sigLength <= 72) { + mod = order("secp256r1"); + } else if (sigLength >= 135 && sigLength <= 139) { + mod = order("secp521r1"); + } else { + throw new RuntimeException("Unrecognized signature length: " + sigLength); + } BigInteger s2 = s.negate().mod(mod); DerOutputStream out = new DerOutputStream(); out.putInteger(r); @@ -193,4 +205,13 @@ tmp.write(DerValue.tag_Sequence, bytes); return new DerValue(tmp.toByteArray()); } + private static BigInteger order(String curve) throws IOException { + try { + AlgorithmParameters ap = AlgorithmParameters.getInstance("EC"); + ap.init(new ECGenParameterSpec(curve)); + return ap.getParameterSpec(ECParameterSpec.class).getOrder(); + } catch (GeneralSecurityException e) { + throw new IOException(e); + } + } } diff -Nru openjdk-21-21.0.13+9/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp openjdk-21-21.0.13.1+2/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp --- openjdk-21-21.0.13+9/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp 2026-11-15 23:20:43.000000000 +0000 @@ -2534,6 +2534,10 @@ __ BIND(L_finalBit); // Now have 1 to 63 bytes left to decode + // A padded Base64 tail shorter than one complete block is handled by Java. + __ cmpl(length, 4); + __ jcc(Assembler::less, L_bruteForce); + // I was going to let Java take care of the final fragment // however it will repeatedly call this routine for every 4 bytes // of input data, so handle the rest here. diff -Nru openjdk-21-21.0.13+9/src/hotspot/share/opto/c2compiler.cpp openjdk-21-21.0.13.1+2/src/hotspot/share/opto/c2compiler.cpp --- openjdk-21-21.0.13+9/src/hotspot/share/opto/c2compiler.cpp 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/hotspot/share/opto/c2compiler.cpp 2026-11-15 23:20:43.000000000 +0000 @@ -241,12 +241,12 @@ break; case vmIntrinsics::_compress_i: case vmIntrinsics::_compress_l: - if (!Matcher::match_rule_supported(Op_CompressBits)) return false; - break; + // disable because of JDK-8350896 + return false; case vmIntrinsics::_expand_i: case vmIntrinsics::_expand_l: - if (!Matcher::match_rule_supported(Op_ExpandBits)) return false; - break; + // disable because of JDK-8350896 + return false; case vmIntrinsics::_numberOfLeadingZeros_i: if (!Matcher::match_rule_supported(Op_CountLeadingZerosI)) return false; break; diff -Nru openjdk-21-21.0.13+9/src/hotspot/share/opto/loopnode.cpp openjdk-21-21.0.13.1+2/src/hotspot/share/opto/loopnode.cpp --- openjdk-21-21.0.13+9/src/hotspot/share/opto/loopnode.cpp 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/hotspot/share/opto/loopnode.cpp 2026-11-15 23:20:43.000000000 +0000 @@ -4256,6 +4256,7 @@ Node* region = phi->in(0); assert(n_ctrl == nullptr || n_ctrl == region, "ctrl parameter must be region"); if (region && region != C->top()) { + // Compute the union over the types of the paths/inputs. for (uint i = 1; i < phi->req(); i++) { Node* val = phi->in(i); Node* use_c = region->in(i); @@ -4266,10 +4267,17 @@ } else { filtered_t = filtered_t->meet(val_t)->is_int(); } + } else { + // We found no constriant, so we have to assume that this path + // is unconstrained, i.e. it could have the whole int range. + filtered_t = TypeInt::INT; } } } } + + // The filtered type may be worse than what we already know + // about n, so take the intersection. const TypeInt* n_t = _igvn.type(n)->is_int(); if (filtered_t != nullptr) { n_t = n_t->join(filtered_t)->is_int(); @@ -4280,6 +4288,8 @@ //------------------------------filtered_type_from_dominators-------------------------------- // Return a possibly more restrictive type for val based on condition control flow of dominators +// Note: we can also return "nullptr", which means "no constraint", and should be interpreted +// as if we returned TypeInt::INT. const TypeInt* PhaseIdealLoop::filtered_type_from_dominators( Node* val, Node *use_ctrl) { if (val->is_Con()) { return val->bottom_type()->is_int(); diff -Nru openjdk-21-21.0.13+9/src/java.base/share/classes/java/lang/AbstractStringBuilder.java openjdk-21-21.0.13.1+2/src/java.base/share/classes/java/lang/AbstractStringBuilder.java --- openjdk-21-21.0.13+9/src/java.base/share/classes/java/lang/AbstractStringBuilder.java 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/classes/java/lang/AbstractStringBuilder.java 2026-11-15 23:20:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -236,6 +236,9 @@ * overflow, this method throws {@code OutOfMemoryError}. */ private void ensureCapacityInternal(int minimumCapacity) { + if ((minimumCapacity & (Integer.MIN_VALUE >> coder)) != 0) { + throwExcessiveLengthError(); + } // overflow-conscious code int oldCapacity = value.length >> coder; if (minimumCapacity - oldCapacity > 0) { @@ -1866,15 +1869,18 @@ } private AbstractStringBuilder repeat(char c, int count) { - int limit = this.count + count; - ensureCapacityInternal(limit); + final int limit; boolean isLatin1 = isLatin1(); if (isLatin1 && StringLatin1.canEncode(c)) { + limit = repeatLimit(LATIN1, this.count, 1, count); + ensureCapacityInternal(limit); Arrays.fill(value, this.count, limit, (byte)c); } else { if (isLatin1) { inflate(); } + limit = repeatLimit(UTF16, this.count, 1, count); + ensureCapacityInternal(limit); for (int index = this.count; index < limit; index++) { StringUTF16.putCharSB(value, index, c); } @@ -1961,22 +1967,48 @@ return repeat(cs.charAt(0), count); } int offset = this.count; - int valueLength = length << coder; - if ((Integer.MAX_VALUE - offset) / count < valueLength) { - throw new OutOfMemoryError("Required length exceeds implementation limit"); - } - int total = count * length; - int limit = offset + total; - ensureCapacityInternal(limit); if (cs instanceof String str) { + ensureCapacityInternal(offset + length); putStringAt(offset, str); } else if (cs instanceof AbstractStringBuilder asb) { append(asb); } else { + ensureCapacityInternal(offset + length); appendChars(cs, 0, length); } - String.repeatCopyRest(value, offset << coder, total << coder, length << coder); + int limit = repeatLimit(coder, offset, length, count); + ensureCapacityInternal(limit); + String.repeatCopyRest(value, offset << coder, (count * length) << coder, length << coder); this.count = limit; return this; } + + /** + * {@return the new {@linkplain #count length} (in {@code char}s) after + * appending the given sequence with specified repetitions} + * + * @param coder the {@linkplain #coder coder} that will be used for encoding + * @param offset the {@linkplain #count offset} (in {@code char}s) to start appending at + * @param seqLength the length in {@code char}s of the sequence to be repeated + * @param seqRepetition the repetition count + * + * @throws OutOfMemoryError If the resultant length is out of bounds + */ + private static int repeatLimit(int coder, int offset, int seqLength, int seqRepetition) { + assert offset >= 0 : "Invalid offset: " + offset; + assert seqLength >= 0 : "Invalid sequence length: " + seqLength; + assert seqRepetition >= 0 : "Invalid sequence repetition count: " + seqRepetition; + long repeatedSeqLength = (long) seqLength * seqRepetition; + long limit = (long) offset + repeatedSeqLength; + long encodedLimit = limit << coder; + if (limit < 0 || encodedLimit < 0 || encodedLimit >= Integer.MAX_VALUE) { + throwExcessiveLengthError(); + } + return (int) limit; + } + + private static void throwExcessiveLengthError() { + throw new OutOfMemoryError("Required length exceeds implementation limit"); + } + } diff -Nru openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java --- openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java 2026-11-15 23:20:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -201,6 +201,15 @@ } if (x509Credentials == null) { + // Only anonymous key exchange is unsigned. For any other + // cipher suite the server Certificate message must have been + // received before the ServerKeyExchange message. + if (!chc.negotiatedCipherSuite.isAnonymous()) { + throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, + "No X.509 credentials negotiated for " + + "DH ServerKeyExchange: missing Certificate"); + } + // anonymous, no authentication, no signature if (m.hasRemaining()) { throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE, diff -Nru openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java --- openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java 2026-11-15 23:20:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -244,6 +244,15 @@ } if (x509Credentials == null) { + // Only anonymous key exchange is unsigned. For any other + // cipher suite the server Certificate message must have been + // received before the ServerKeyExchange message. + if (!chc.negotiatedCipherSuite.isAnonymous()) { + throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, + "No X.509 credentials negotiated for " + + "ECDH ServerKeyExchange: missing Certificate"); + } + // anonymous, no authentication, no signature if (m.hasRemaining()) { throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE, diff -Nru openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java --- openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java 2026-11-15 23:20:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -133,6 +133,15 @@ // The consuming happens in client side only. ClientHandshakeContext chc = (ClientHandshakeContext)context; + // Check for an unprocessed server Certificate message. If + // that handshake consumer is still present then that expected + // message was not sent. + if (chc.handshakeConsumers.containsKey( + SSLHandshake.CERTIFICATE.id)) { + throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, + "Unexpected ServerHelloDone handshake message."); + } + SSLConsumer certStatCons = chc.handshakeConsumers.remove( SSLHandshake.CERTIFICATE_STATUS.id); if (certStatCons != null) { diff -Nru openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java --- openjdk-21-21.0.13+9/src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/classes/sun/security/ssl/ServerKeyExchange.java 2026-11-15 23:20:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -92,6 +92,15 @@ // clean up this consumer chc.handshakeConsumers.remove(SSLHandshake.SERVER_KEY_EXCHANGE.id); + // If the Certificate consumer is still registered, the server + // omitted the required Certificate message before sending + // ServerKeyExchange. + if (chc.handshakeConsumers.containsKey( + SSLHandshake.CERTIFICATE.id)) { + throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE, + "Unexpected ServerKeyExchange handshake message."); + } + // Any receipt/consumption of the CertificateRequest before // ServerKeyExchange is a state machine violation. We may not // know for sure if an early CR message is a violation though until @@ -131,4 +140,3 @@ } } } - diff -Nru openjdk-21-21.0.13+9/src/java.base/share/conf/security/java.security openjdk-21-21.0.13.1+2/src/java.base/share/conf/security/java.security --- openjdk-21-21.0.13+9/src/java.base/share/conf/security/java.security 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/conf/security/java.security 2026-11-15 23:20:43.000000000 +0000 @@ -509,6 +509,39 @@ sun.security.krb5.maxReferrals=5 # +# Policy for Kerberos service transited field checking: +# +# In cross-realm authentication, if the service ticket includes a non-empty +# transited field but the ticket flags do not have TRANSIT-POLICY-CHECKED set, +# the application server should perform the transited-realm checks itself. +# This is required in Section 2.7 of RFC 4120. +# +# This property determines whether the server performs the transited-realm +# check when the service ticket does not have the TRANSIT-POLICY-CHECKED flag +# set. If the value is set to "true", the JDK performs the check when +# GSSContext.acceptSecContext is called to process the incoming context- +# establishment token, which contains the service ticket. +# +# The check uses the explicit paths configured in the [capaths] section of +# krb5.conf, or if that is not configured, uses an implicit hierarchical +# relationship between realm names. If any of the realms encoded in the +# transited field are not allowed, the context establishment will fail. +# If the value is set to "false", no check is performed. The default value +# of this property is "true". +# +# This property should be used at your own risk. +# +# If a system property of the same name is also specified, it supersedes the +# security property value defined here. +# +# Note: This property is currently used by the Java Kerberos GSS-API mechanism +# of the JDK Reference implementation. An application using native GSS-API +# does not use this property; instead it follows the policy of the underlying +# native GSS library. Support for this property is not guaranteed in other +# Java SE implementations. +sun.security.krb5.acceptor.checkTransitedPolicy = true + +# # This property contains a list of disabled EC Named Curves that can be included # in the jdk.[tls|certpath|jar].disabledAlgorithms properties. To include this # list in any of the disabledAlgorithms properties, add the property name as diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem openjdk-21-21.0.13.1+2/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem --- openjdk-21-21.0.13+9/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem 2026-11-15 23:20:43.000000000 +0000 @@ -747,3 +747,433 @@ 0vmsP/8QSlTOBqO+QFQ6R82BtTvBNU3qbVICV4QObsxib++FAFL56NApPqskg7Vz LfNIAjKabHUcjbuZkmg6jr4BfYW7+oQDHCsYgADjjKGdKz/8U/fP -----END CERTIFICATE----- + +// Subject: CN=EM DV TLS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// a0:24:fd:f4:ba:66:5c:78:5c:e4:a0:20:48:38:58:b7 +-----BEGIN CERTIFICATE----- +MIIDzjCCAragAwIBAgIRAKAk/fS6Zlx4XOSgIEg4WLcwDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJW +MRswGQYDVQQDDBJFTSBEViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAATnntnASpdzxHNeUREdqFrCvV5kqzdLgOEsvCA47B5PDjuBL8mFnh5nr7BO +L4vJf3SFumWqkR7opORbYtXMA9Vr5nizw4y03JN8okYOI4RTyJKTXSnUT5HhVga2 +PM7atGijggE1MIIBMTAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd +BgNVHQ4EFgQU4h4v5xwZOQ5VS2LBICRXNSSKJRQwDgYDVR0PAQH/BAQDAgEGMBIG +A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC +MDEGA1UdIAQqMCgwCAYGZ4EMAQIBMA0GCysGAQQBg44hAQABMA0GCysGAQQBg44h +AQJkMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FB +QUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEF +BQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IB +AQBzQ1IoqpdotM6gFrR4Q3YrKifOLeaj5XXunldpVE/vZn2TxC2y0s8oYiLR5ICE +wqVXSB7N6BM1Mp+Nif7Jbhb2IswAfSR4Iik8+B0iRmi7lYoNlycCgHjmsjOmZaxM +QkPmjXAJbG5f4V41OsvJZmS7lI3r0IuvEDVX3GAZ13on6IImSs9ybNpHQ7NCqkMQ +7wH4uAO1dtpFycgJSdHaCOhHjrox2BTYGLdpUrYwY3EOAjlZ8UGgsxs7mG+xquMl +bN1LFURwfnkVMP3T/DBIZ/ys2+lNFyxK3FlArrV4/000uTnVB1lO8oGORYdXoT5V +GUyRCEIDhF5TBUuKF4E3kf1h +-----END CERTIFICATE----- + +// Subject: CN=EM EV TLS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// d8:f8:68:5e:4f:2b:d9:d8:24:02:a8:5a:1c:1e:b7:31 +-----BEGIN CERTIFICATE----- +MIIDzTCCArWgAwIBAgIRANj4aF5PK9nYJAKoWhwetzEwDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJW +MRswGQYDVQQDDBJFTSBFViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAQl26haZNOX2gsQUunqVG5Ie+/qnJ2daKDF6tz+73Wmm7XW/AH0K/vKbrQL +zWTAdn42/9Bdl6gTxaoMbJUw55z18IZkaPE4BkIKpchRhAseJSVA55DktlTDhS7W +SvHoZX2jggE0MIIBMDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd +BgNVHQ4EFgQUPtwg2YlGmId7hz/YgUeyXBXYRwYwDgYDVR0PAQH/BAQDAgEGMBIG +A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC +MDAGA1UdIAQpMCcwBwYFZ4EMAQEwDQYLKwYBBAGDjiEBAAEwDQYLKwYBBAGDjiEB +AngwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFB +Q2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUF +BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQADggEB +AJNFuAFW9Gnw/8+kCO4KIlZdnM1Sh2u+8cK0EYAHhXpb5FlGvYkcARigo5oS7VoM +7FOYlTueV6yICZKNAYawZPJPhNCGK+rp3cQBEz6d0n8OZEYZov9lb3ll8ORgSDuf +FVIW6Gagg/UnOamLBTOR8eD5V73SCme/B2cHUDw+m5E8cc+0Ujzz3Cn3ex5JrhXk +2T3s8PoVzEmhTgGboFfcWO1EYhPPrYwdxPYRQIXAXUXhLEOVNL9ASbZJLFI8E1IM +m7NwxVN2s38jWpaCUaaF0tg7hfiy7oe13rzJfHsdqldJVTTUTPWVx8TC4ju0VLet +bAlwhwFT6AP8uIVMGUHNw24= +-----END CERTIFICATE----- + +// Subject: CN=EM OV TLS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// e9:42:23:bd:e9:2f:91:4e:5a:b9:ac:ab:fd:ac:37:10 +-----BEGIN CERTIFICATE----- +MIIDzjCCAragAwIBAgIRAOlCI73pL5FOWrmsq/2sNxAwDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJW +MRswGQYDVQQDDBJFTSBPViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAARziXqg6zz9yosSQC/68KvE4SErr43ud4rJ7i1tuD+sKAxeBWOK56Ks1xwy +Ko42HN659pxDArndjXPRzGyqsswK7k4hbOl53VGKSvS2JuVoTN1lgDftDIVOTMEv +TPhkbQ2jggE1MIIBMTAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd +BgNVHQ4EFgQUm9hlUa/n5yw3rQjuaRnZvzeErgowDgYDVR0PAQH/BAQDAgEGMBIG +A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC +MDEGA1UdIAQqMCgwCAYGZ4EMAQICMA0GCysGAQQBg44hAQABMA0GCysGAQQBg44h +AQJuMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FB +QUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEF +BQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IB +AQALRoOSvkzRa+tN5Rje9W5GiXd/qsicd9N6Gnh0SWC7VyWH+HycIqAnFCMYZznj +CeGusomFYHE42SHWr85JDIbgzy6y3dO4i9n9w0Bx7yrXWBbDzFS8VgA3+EY4Cg7y +mtoC3RPOJVtaXXPZ+68X804g1Mj+3vCSHj2lNPVgco0OzSIOJ/KMg1R9MLBkiKzb +bERAGZHejY0HBhYd76IINZN8z6bBNah2UdFYxsOisLynPQUkol6gRLum024/FzVl +CCDfnUusrkr+mAfPAvD/Vb8bhpA7jYtepuU+2mIdShj5lLlvAwZphn+ypWycuo2x +0k9mldz2dqI9nhCiY+TTIOOR +-----END CERTIFICATE----- + +// Subject: CN=EM DV TLS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// 91:f3:47:f1:a5:b7:d3:99:62:b9:5e:0e:e4:e2:99:d1 +-----BEGIN CERTIFICATE----- +MIIDzzCCAregAwIBAgIRAJHzR/Glt9OZYrleDuTimdEwDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu +YzEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EE +ACIDYgAEOnp4YsjETTJN3WkDOmeCwO/u/kBV5ooSP6A3G6O9kZRRTuFypDPjYw8C +vRiAN9nlFJ+bd9uUooHfmHsv6oiLdL3+j9pMEJnubKGVZv4+8OX2sJpVbMyLpQVh +3xsqRB0Bo4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQw +HQYDVR0OBBYEFK5+EFw8KZbBqEcnBVnx4D3U5QrzMA4GA1UdDwEB/wQEAwIBBjAS +BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD +AjAxBgNVHSAEKjAoMAgGBmeBDAECATANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOO +IQECZDBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9B +QUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYB +BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOC +AQEAr7b6Mx11TIJgVzHt6EH5qGNWeiiqoMrp8E5/k8s+jvupx1n083pZ5XOzUzND +wEUe0W4C4FIGUHNQ4XDwqOw0yK42xqm2dvCKgsko2UvDlT0haZVtTCeWMQOe5J/J +ziaMfZwsZNfZ3aaI6XPtWDZtwY8AaNfyaeCpbtm5GcGnyNWk4jSNpbtpo6NjfXuP +CFOm3rTjJ4zytP7Tso6iMm0L01cYFOlTmoPv4515R2r3SPnKDtijoB/D/vgxzojv +DafgyG9afX8+laO9NbMMz4sqC1vZx3984i/sBNFiugm3Vvdq5OdJRjuGC1QILIs6 +dg/K3i8VQqRpbfaM9kIlMzZ3dQ== +-----END CERTIFICATE----- + +// Subject: CN=EM OV TLS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// 8d:5a:48:11:93:9e:f4:47:d7:71:11:cd:d9:84:9a:e9 +-----BEGIN CERTIFICATE----- +MIIDzzCCAregAwIBAgIRAI1aSBGTnvRH13ERzdmEmukwDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu +YzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EE +ACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZfjpRIOHv +1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+N7ulaVSf +HAKycO1no4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQw +HQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMA4GA1UdDwEB/wQEAwIBBjAS +BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD +AjAxBgNVHSAEKjAoMAgGBmeBDAECAjANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOO +IQECbjBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9B +QUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYB +BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOC +AQEAHlbhZpjhkPEAQVhPHRtBDaHqiisVD20pQ1TUeSx3l62Qe7NQ0b7vWQy7DN0i +KOu7BGpP5EnIjvXbz9FhpfPJ4FhKEt3tQ51rqXz2oD8vRaryvExWPobDUz3j7HN6 +OzBsVMIe3PD7AAkpky0x8zMSi/ep5R9OMzybmNptbtppyuB5ytgq+h7lQdRIP+CQ +TaJX3qTgfMqzntYre5GljmEB5hU2/rSn8zoSU2APkJidlZFpghtgbD4I2VRHZvCw +FFr/SrFM9pwrgbJNZ1MtyTSVgI5NlNb0aMfLR+/r6jJt3ROeY2yh2QQ2dx+Yqgdb +uL5ChFWOQU+ErSDnUq7yr+pjBQ== +-----END CERTIFICATE----- + +// Subject: CN=EM OV CS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// d6:a5:ef:61:3b:39:0f:32:ef:9c:df:34:9f:77:28:41 +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIRANal72E7OQ8y75zfNJ93KEEwDQYJKoZIhvcNAQELBQAw +ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV +BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y +ODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu +YzEaMBgGA1UEAwwRRU0gT1YgQ1MgQ0EgLSBHM0MwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAS58OBjRwKmnKaq3UQ8/WLEG5uksgkkaX15dOdpGhJvuWr7PjTC/TvF9IMG +HyZdwqWENjRzI1EENrKPBPOGI2MGeYDiUD4CUy1lRiNacWWiWaHvSW90G1/e53hy +COS4+u+jggEsMIIBKDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd +BgNVHQ4EFgQU7m9zKY1vv6ezG8OVNPYVVkR4ZrcwDgYDVR0PAQH/BAQDAgEGMBIG +A1UdEwEB/wQIMAYBAf8CAQAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwMgYDVR0gBCsw +KTAIBgZngQwBBAEwDQYLKwYBBAGDjiEBAAEwDgYMKwYBBAGDjiEBAoFIMEMGA1Ud +HwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmlj +YXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0 +cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBgGbZ+NDkn +2Fr5dCVs/51+6cT5iEPP1stglX4TI2UaNh9LmPdltxXw3crV8gK5L8i+d+ScGibF +y0obtBHNTldXDgLnAHIzY3n+pceyKj7O2ae9CYnyuu5RBifeI3XYKowWE+oXnVGF +Oy0CvCJ/JsdP6aYgoCa9hGnAYicYQQL6MOMQZ5PuhcSM8t4giIzrpgrEkUP93GYE +emDG5Z8BYwKs80lLeQNBnwg/VHJ3iEF/o84RXYwrlrKqJ+33C094o6LNikMJCqOK +/WYHZSR8Xyhf8GXFAj5pZuI6Bcpug2V/E7i42j8OBhc25aNYDqK+B0qmb90sjNUB +g3tJeSIb/599 +-----END CERTIFICATE----- + +// Subject: CN=EM OV CS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// 41:e3:2b:73:ac:18:5d:6c:e0:d7:48:0b:ac:f8:4e:69 +-----BEGIN CERTIFICATE----- +MIIDwzCCAqugAwIBAgIQQeMrc6wYXWzg10gLrPhOaTANBgkqhkiG9w0BAQsFADB7 +MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD +VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE +AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI1MDUxNDAwMDAwMFoXDTI4 +MTIzMTIzNTk1OVowPjELMAkGA1UEBhMCTkwxEzARBgNVBAoMCmVNdWRocmEgQlYx +GjAYBgNVBAMMEUVNIE9WIENTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYFK4EEACID +YgAEqrsPsGZqz88B+tUr/P1MK/LLPDSX3nOVDlgZth/mlQmHQcjEkUObNKBDHK/+ +W/m0wcjorgAB+fTcitgsWfNjnpbNbD1NsM7+wmw9YlF7N3YTcnQ/jordd7EAZPKr +5eBQo4IBLDCCASgwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYD +VR0OBBYEFHn66OzP2w11jaRY1p+27dx8Sd7mMA4GA1UdDwEB/wQEAwIBBjASBgNV +HRMBAf8ECDAGAQH/AgEAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMDIGA1UdIAQrMCkw +CAYGZ4EMAQQBMA0GCysGAQQBg44hAQABMA4GDCsGAQQBg44hAQKBSDBDBgNVHR8E +PDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0 +ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6 +Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAIh0OzWsdBYhY +7+yxPGyosRL+uUSN6/Mrd30fBuougs5FVWQ3cRgLhImnUUgXADY9buugWhMmfT3c +yU5T1MFXZXClCILm5mfg+oqm/ikUWJl3Ayf2GvYf2O++6vzqvkn418nI5Lpdt0O7 +Li524YS/3CZHDA+zZQ7rrHpZXgQ9Hmp8AUQ4FneaGjNanFoYxiZxwCyW5z4u7AoK +0bmOVqKtcDFoVNz5++G9TYDJdhWOXmKKgzqRo1MK0PjazNT7MGHqknP93SqMVJ1g +mX/qNWxYteAjlvFanQxBNX/+TRxDjuFsEHO/7BvqSpIIck0UEEfizhN8zNpWLbcl +EqVgl0g39A== +-----END CERTIFICATE----- + +// Subject: CN=EM DV TLS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// a4:ae:e6:78:f2:33:62:b4:c0:e4:60:b7:72:f2:14 +-----BEGIN CERTIFICATE----- +MIIDaDCCAu6gAwIBAgIQAKSu5njyM2K0wORgt3LyFDAKBggqhkjOPQQDAzBWMQsw +CQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl +ZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTU1 +NDA4WhcNNDAwNDI4MTgzMDAwWjA/MQswCQYDVQQGEwJOTDETMBEGA1UECgwKZU11 +ZGhyYSBCVjEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNCMHYwEAYHKoZIzj0C +AQYFK4EEACIDYgAE557ZwEqXc8RzXlERHahawr1eZKs3S4DhLLwgOOweTw47gS/J +hZ4eZ6+wTi+LyX90hbplqpEe6KTkW2LVzAPVa+Z4s8OMtNyTfKJGDiOEU8iSk10p +1E+R4VYGtjzO2rRoo4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L +WUIgkFQwHQYDVR0OBBYEFOIeL+ccGTkOVUtiwSAkVzUkiiUUMB0GA1UdJQQWMBQG +CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow +KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB +BAGDjiEBAmQwCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY +aHR0cDovL29jc3AtYi5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw +b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRFZUTFNDQUczQi5wN2MwNwYDVR0f +BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j +cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E +AwMDaAAwZQIwLmsGXi6oFMJ2klkcEMXMug6gvxQWZWkewiDWVzQyl2L6z6DuQfPO +Ibh1grvdULDCAjEAxZvLlxUavG69J6wnSjC8XBbqNIQsJ6CE2QdNOe84Ptxb6VG8 +gt2TlfJbHii+KNvK +-----END CERTIFICATE----- + +// Subject: CN=EM DV TLS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// 58:8b:2e:3c:2b:b8:cd:a1:3e:1a:12:09:25:43:21 +-----BEGIN CERTIFICATE----- +MIIDaDCCAu6gAwIBAgIPWIsuPCu4zaE+GhIJJUMhMAoGCCqGSM49BAMDMFYxCzAJ +BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk +MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM1 +MDlaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVk +aHJhIEluYzEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0C +AQYFK4EEACIDYgAEOnp4YsjETTJN3WkDOmeCwO/u/kBV5ooSP6A3G6O9kZRRTuFy +pDPjYw8CvRiAN9nlFJ+bd9uUooHfmHsv6oiLdL3+j9pMEJnubKGVZv4+8OX2sJpV +bMyLpQVh3xsqRB0Bo4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L +WUIgkFQwHQYDVR0OBBYEFK5+EFw8KZbBqEcnBVnx4D3U5QrzMB0GA1UdJQQWMBQG +CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow +KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB +BAGDjiEBAmQwCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY +aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw +b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRFZUTFNDQUczQy5wN2MwNwYDVR0f +BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j +cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E +AwMDaAAwZQIxAMEN2HWMocbuWdy1d33pH6JpMvP/V/DIS5PtZbv1Q7TXEbxrcyxg +yuddOJscYDJJlAIwB4sH1BpbScDzkdD4tJBSwrG/1Mx82vb8YaySehNuu1+1oXNd +AEKwaJ0mVzScy2+6 +-----END CERTIFICATE----- + +// Subject: CN=EM EV TLS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// c7:c4:1e:fe:92:d8:25:f0:5e:ae:84:1a:4a:82:c1 +-----BEGIN CERTIFICATE----- +MIIDaDCCAu2gAwIBAgIQAMfEHv6S2CXwXq6EGkqCwTAKBggqhkjOPQQDAzBWMQsw +CQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl +ZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTYw +MzMxWhcNNDAwNDI4MTgzMDAwWjA/MQswCQYDVQQGEwJOTDETMBEGA1UECgwKZU11 +ZGhyYSBCVjEbMBkGA1UEAwwSRU0gRVYgVExTIENBIC0gRzNCMHYwEAYHKoZIzj0C +AQYFK4EEACIDYgAEJduoWmTTl9oLEFLp6lRuSHvv6pydnWigxerc/u91ppu11vwB +9Cv7ym60C81kwHZ+Nv/QXZeoE8WqDGyVMOec9fCGZGjxOAZCCqXIUYQLHiUlQOeQ +5LZUw4Uu1krx6GV9o4IBlTCCAZEwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L +WUIgkFQwHQYDVR0OBBYEFD7cINmJRpiHe4c/2IFHslwV2EcGMB0GA1UdJQQWMBQG +CCsGAQUFBwMBBggrBgEFBQcDAjBcBgNVHSAEVTBTMDkGCysGAQQBg44hAQABMCow +KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB +BAGDjiEBAngwBwYFZ4EMAQEwdQYIKwYBBQUHAQEEaTBnMCQGCCsGAQUFBzABhhho +dHRwOi8vb2NzcC1iLmVtc2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBv +c2l0b3J5LmVtc2lnbi5jb20vY2VydHMvRU1FVlRMU0NBRzNCLnA3YzA3BgNVHR8E +MDAuMCygKqAohiZodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3R0bHNjYWczLmNy +bDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQD +AwNpADBmAjEA9Jq999oaOUKhFwopw33iCmt0OHIn3gjT43GfuOHR/YckXdwoNdDA +lIEhz0NgRO3/AjEAvY/a3OMvktIZLYjn+WLKmp0QhrIMV+e6EpS7j4GVeOKouNp6 +MN/P+ByGeiRMghzB +-----END CERTIFICATE----- + +// Subject: CN=EM EV TLS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// 80:09:92:8a:64:10:76:01:af:05:fa:2f:19:f1:09 +-----BEGIN CERTIFICATE----- +MIIDaDCCAu6gAwIBAgIQAIAJkopkEHYBrwX6LxnxCTAKBggqhkjOPQQDAzBWMQsw +CQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl +ZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTUz +OTMxWhcNNDAwNDI4MTgzMDAwWjBAMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLZU11 +ZGhyYSBJbmMxGzAZBgNVBAMMEkVNIEVWIFRMUyBDQSAtIEczQzB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABC1W6Cmm+4LGSkaX2WCvlR6QZ66R+SbTQwbaSKiq63hptqZ+ +bSdCbgRCqgOzbhmI3/Y2UU7hzwf1uks/8qBmRa59MdWGatMao9JG6wsxd+6Zy3Vm +xRbOdICKZo+R8MR/yqOCAZUwggGRMB8GA1UdIwQYMBaAFOE6qyF88eNNVK7Ucrf9 +i1lCIJBUMB0GA1UdDgQWBBSmJV6AqU2385Z8G8eR35K87kvrXzAdBgNVHSUEFjAU +BggrBgEFBQcDAQYIKwYBBQUHAwIwXAYDVR0gBFUwUzA5BgsrBgEEAYOOIQEAATAq +MCgGCCsGAQUFBwIBFhxodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tMA0GCysG +AQQBg44hAQJ4MAcGBWeBDAEBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY +aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw +b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRVZUTFNDQUczQy5wN2MwNwYDVR0f +BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j +cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E +AwMDaAAwZQIwBy1wTnzH4lXDTy2PD91ysLjvnlVN3JbJmc1BIMEU8TOLkYVHibMc +9HeyonikFSfmAjEA6uE3QRxlrZTz/1/lXPTEMUhoauAtycagtlNFp79kjhvNa2/f +Aal1GNxsOutLnr0Y +-----END CERTIFICATE----- + +// Subject: CN=EM OV CS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=emSign Root CS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// 78:18:93:3f:8f:85:b4:61:9a:2b:35:fb:a8:3d:0a +-----BEGIN CERTIFICATE----- +MIIDWzCCAuCgAwIBAgIPeBiTP4+FtGGaKzX7qD0KMAoGCCqGSM49BAMDMFUxCzAJ +BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk +MR8wHQYDVQQDDBZlbVNpZ24gUm9vdCBDUyBDQSAtIEczMB4XDTI1MDQzMDE2MDgy +N1oXDTQwMDQyODE4MzAwMFowPjELMAkGA1UEBhMCTkwxEzARBgNVBAoMCmVNdWRo +cmEgQlYxGjAYBgNVBAMMEUVNIE9WIENTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYF +K4EEACIDYgAEqrsPsGZqz88B+tUr/P1MK/LLPDSX3nOVDlgZth/mlQmHQcjEkUOb +NKBDHK/+W/m0wcjorgAB+fTcitgsWfNjnpbNbD1NsM7+wmw9YlF7N3YTcnQ/jord +d7EAZPKr5eBQo4IBizCCAYcwHwYDVR0jBBgwFoAUaHQD+IXKjVRQVx0W4MjeRQ2r +zS0wHQYDVR0OBBYEFHn66OzP2w11jaRY1p+27dx8Sd7mMBMGA1UdJQQMMAoGCCsG +AQUFBwMDMF4GA1UdIARXMFUwOQYLKwYBBAGDjiEBAAEwKjAoBggrBgEFBQcCARYc +aHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTAOBgwrBgEEAYOOIQECgUgwCAYG +Z4EMAQQBMHQGCCsGAQUFBwEBBGgwZjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3At +Yi5lbXNpZ24uY29tMD4GCCsGAQUFBzAChjJodHRwOi8vcmVwb3NpdG9yeS5lbXNp +Z24uY29tL2NlcnRzL0VNT1ZDU0NBRzNCLnA3YzA2BgNVHR8ELzAtMCugKaAnhiVo +dHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3Rjc2NhZzMuY3JsMA4GA1UdDwEB/wQE +AwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMAoGCCqGSM49BAMDA2kAMGYCMQC/zr03 +YEELsNKqzUtH2dVFi4BaKFdyrr/6G1dIWp8KAVgsw2/u4lyyboUDaC9jDvICMQC9 +HTxku84tNX9dmHOtH7aC2Nu/JM0jTf6KjZAvovCJzzv1IFWSZpVLZibynMLXOrM= +-----END CERTIFICATE----- + +// Subject: CN=EM OV CS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=emSign Root CS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// 54:4b:7f:92:2c:31:ae:22:0a:4a:92:29:16:f6:e6 +-----BEGIN CERTIFICATE----- +MIIDWzCCAuGgAwIBAgIPVEt/kiwxriIKSpIpFvbmMAoGCCqGSM49BAMDMFUxCzAJ +BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk +MR8wHQYDVQQDDBZlbVNpZ24gUm9vdCBDUyBDQSAtIEczMB4XDTI1MDQzMDE2Mzg0 +MFoXDTQwMDQyODE4MzAwMFowPzELMAkGA1UEBhMCVVMxFDASBgNVBAoMC2VNdWRo +cmEgSW5jMRowGAYDVQQDDBFFTSBPViBDUyBDQSAtIEczQzB2MBAGByqGSM49AgEG +BSuBBAAiA2IABLnw4GNHAqacpqrdRDz9YsQbm6SyCSRpfXl052kaEm+5avs+NML9 +O8X0gwYfJl3CpYQ2NHMjUQQ2so8E84YjYwZ5gOJQPgJTLWVGI1pxZaJZoe9Jb3Qb +X97neHII5Lj676OCAYswggGHMB8GA1UdIwQYMBaAFGh0A/iFyo1UUFcdFuDI3kUN +q80tMB0GA1UdDgQWBBTub3MpjW+/p7Mbw5U09hVWRHhmtzATBgNVHSUEDDAKBggr +BgEFBQcDAzBeBgNVHSAEVzBVMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEW +HGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDgYMKwYBBAGDjiEBAoFIMAgG +BmeBDAEEATB0BggrBgEFBQcBAQRoMGYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw +LWMuZW1zaWduLmNvbTA+BggrBgEFBQcwAoYyaHR0cDovL3JlcG9zaXRvcnkuZW1z +aWduLmNvbS9jZXJ0cy9FTU9WQ1NDQUczQy5wN2MwNgYDVR0fBC8wLTAroCmgJ4Yl +aHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290Y3NjYWczLmNybDAOBgNVHQ8BAf8E +BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQDAwNoADBlAjEA8yPg +8sntOhLwV2QXJ5LEaKSpo/fnE3uOgTadK73fDhyjiqr0Io9GVuQTYqBPbQ2TAjBg +euApmBS486+iei03lRrp139dPw6k28jjGNvWsAU7A1N86J1zPJVDEyVH+nMAWC0= +-----END CERTIFICATE----- + +// Subject: CN=EM OV TLS CA - G3B, O=eMudhra BV, C=NL +// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// 6c:ad:a3:67:fb:1c:10:00:88:12:0e:a2:02:d5:68 +-----BEGIN CERTIFICATE----- +MIIDZjCCAu2gAwIBAgIPbK2jZ/scEACIEg6iAtVoMAoGCCqGSM49BAMDMFYxCzAJ +BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk +MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNjAw +MTJaFw00MDA0MjgxODMwMDBaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVk +aHJhIEJWMRswGQYDVQQDDBJFTSBPViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIB +BgUrgQQAIgNiAARziXqg6zz9yosSQC/68KvE4SErr43ud4rJ7i1tuD+sKAxeBWOK +56Ks1xwyKo42HN659pxDArndjXPRzGyqsswK7k4hbOl53VGKSvS2JuVoTN1lgDft +DIVOTMEvTPhkbQ2jggGWMIIBkjAfBgNVHSMEGDAWgBThOqshfPHjTVSu1HK3/YtZ +QiCQVDAdBgNVHQ4EFgQUm9hlUa/n5yw3rQjuaRnZvzeErgowHQYDVR0lBBYwFAYI +KwYBBQUHAwEGCCsGAQUFBwMCMF0GA1UdIARWMFQwOQYLKwYBBAGDjiEBAAEwKjAo +BggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTANBgsrBgEE +AYOOIQECbjAIBgZngQwBAgIwdQYIKwYBBQUHAQEEaTBnMCQGCCsGAQUFBzABhhho +dHRwOi8vb2NzcC1iLmVtc2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBv +c2l0b3J5LmVtc2lnbi5jb20vY2VydHMvRU1PVlRMU0NBRzNCLnA3YzA3BgNVHR8E +MDAuMCygKqAohiZodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3R0bHNjYWczLmNy +bDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQD +AwNnADBkAjBAk+5BizdJhrED3wb7F2Gm7bWI60dlNd075nghT2TrR4NWKZtJZcbc +28xxIY/NONICMF6mPdsjosaqmvEMWqKcBh4vsIvXSKnQj5o8zrFB4oKS+accjYTe +8Dz3bQjauvy9uw== +-----END CERTIFICATE----- + +// Subject: CN=EM OV TLS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=emSign Root TLS CA - G3, O=eMudhra Technologies Limited, C=IN +// Serial Number: +// 29:69:26:c2:27:a3:a1:52:63:92:b1:94:82:a5:04 +-----BEGIN CERTIFICATE----- +MIIDaDCCAu6gAwIBAgIPKWkmwiejoVJjkrGUgqUEMAoGCCqGSM49BAMDMFYxCzAJ +BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk +MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM3 +NDFaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVk +aHJhIEluYzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0C +AQYFK4EEACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZ +fjpRIOHv1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+ +N7ulaVSfHAKycO1no4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L +WUIgkFQwHQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMB0GA1UdJQQWMBQG +CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow +KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB +BAGDjiEBAm4wCAYGZ4EMAQICMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY +aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw +b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNT1ZUTFNDQUczQy5wN2MwNwYDVR0f +BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j +cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E +AwMDaAAwZQIxAMSZt2xsPeumRdeSMSQ3CbzIZeQ/q7GDCWfeE1Pq+mhgA6gRM44c +NVF3xJ+wsxJk+wIwFJbaDMokD8Ei6eNOiA8yUMYvfzQyngmrhZQMdPCK1SewrR79 +4rSb9vGqxZzelQth +-----END CERTIFICATE----- + +// Subject: CN=EM EV TLS CA - G3C, O=eMudhra Inc, C=US +// Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB +// Serial Number: +// 05:f0:78:75:2d:ec:e7:a1:bb:85:95:d3:03:16:71:71 +-----BEGIN CERTIFICATE----- +MIIDzTCCArWgAwIBAgIQBfB4dS3s56G7hZXTAxZxcTANBgkqhkiG9w0BAQsFADB7 +MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD +VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE +AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI1MDUxNDAwMDAwMFoXDTI4 +MTIzMTIzNTk1OVowQDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC2VNdWRocmEgSW5j +MRswGQYDVQQDDBJFTSBFViBUTFMgQ0EgLSBHM0MwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAQtVugppvuCxkpGl9lgr5UekGeukfkm00MG2kioqut4abamfm0nQm4EQqoD +s24ZiN/2NlFO4c8H9bpLP/KgZkWufTHVhmrTGqPSRusLMXfumct1ZsUWznSAimaP +kfDEf8qjggE0MIIBMDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAd +BgNVHQ4EFgQUpiVegKlNt/OWfBvHkd+SvO5L618wDgYDVR0PAQH/BAQDAgEGMBIG +A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC +MDAGA1UdIAQpMCcwBwYFZ4EMAQEwDQYLKwYBBAGDjiEBAAEwDQYLKwYBBAGDjiEB +AngwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFB +Q2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUF +BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQADggEB +AIFfHiaMSjnrdZygRYV4ekRBmG7ybcFk4hGQWMMyMFi0cAEk2+dGfz5bl8IaIbLq +z+uVJzhOgVEX7WqIfgbWfFsfPYHYjPHBmy7SlZ3BwA86IQ6qF/etpX2/qL9A5yRN +N3nVowUpaqV6H3aCpkAh3wR2ZNkvAbLDvPz3J0l+sEWjWv+ZISOV4R+hXDTdPXV0 +1lKxnbwqEsdo/sE2QkCDKwFrZh/0uKjWspydJj+jSaDLTrGNx50Dgmn7VEcD1ZI5 +FXjknVUiO25YlmS1dtVZSBbyUKSjlrP/yDwPcZunoAsmCAAtCKsFLviLaymzvsKI +eSSDGxpSySp2VCxompGDk8g= +-----END CERTIFICATE----- diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/comodoaaaca openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/comodoaaaca --- openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/comodoaaaca 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/comodoaaaca 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Owner: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB -Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB -Serial number: 1 -Valid from: Thu Jan 01 00:00:00 GMT 2004 until: Sun Dec 31 23:59:59 GMT 2028 -Signature algorithm name: SHA1withRSA -Subject Public Key Algorithm: 2048-bit RSA key -Version: 3 ------BEGIN CERTIFICATE----- -MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb -MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj -YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL -MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE -BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM -GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua -BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe -3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 -YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR -rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm -ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU -oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF -MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v -QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t -b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF -AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q -GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz -Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 -G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi -l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 -smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== ------END CERTIFICATE----- diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/emsigneccrootcag3 openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/emsigneccrootcag3 --- openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/emsigneccrootcag3 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/emsigneccrootcag3 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Owner: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN -Issuer: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN -Serial number: 3cf607a968700eda8b84 -Valid from: Sun Feb 18 18:30:00 GMT 2018 until: Wed Feb 18 18:30:00 GMT 2043 -Signature algorithm name: SHA384withECDSA -Subject Public Key Algorithm: 384-bit EC (secp384r1) key -Version: 3 ------BEGIN CERTIFICATE----- -MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQG -EwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNo -bm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g -RzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBrMQswCQYDVQQGEwJJ -TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s -b2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMw -djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0 -WXTsuwYc58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xyS -fvalY8L1X44uT6EYGQIrMgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuB -zhccLikenEhjQjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggq -hkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+DCBeQyh+KTOgNG3qxrdWB -CUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7jHvrZQnD -+JbNR6iC8hZVdyR+EhCVBCyj ------END CERTIFICATE----- diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/emsignrootcag1 openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/emsignrootcag1 --- openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/emsignrootcag1 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/emsignrootcag1 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Owner: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN -Issuer: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN -Serial number: 31f5e4620c6c58edd6d8 -Valid from: Sun Feb 18 18:30:00 GMT 2018 until: Wed Feb 18 18:30:00 GMT 2043 -Signature algorithm name: SHA256withRSA -Subject Public Key Algorithm: 2048-bit RSA key -Version: 3 ------BEGIN CERTIFICATE----- -MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYD -VQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBU -ZWNobm9sb2dpZXMgTGltaXRlZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBH -MTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgxODMwMDBaMGcxCzAJBgNVBAYTAklO -MRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xv -Z2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQz -f2N4aLTNLnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO -8oG0x5ZOrRkVUkr+PHB1cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aq -d7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHWDV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhM -tTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ6DqS0hdW5TUaQBw+jSzt -Od9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrHhQIDAQAB -o0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQD -AgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31x -PaOfG1vR2vjTnGs2vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjM -wiI/aTvFthUvozXGaCocV685743QNcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6d -GNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q+Mri/Tm3R7nrft8EI6/6nAYH -6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeihU80Bv2noWgby -RQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx -iN66zB+Afko= ------END CERTIFICATE----- diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/emsignrootcag2 openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/emsignrootcag2 --- openjdk-21-21.0.13+9/src/java.base/share/data/cacerts/emsignrootcag2 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/cacerts/emsignrootcag2 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Owner: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN -Issuer: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN -Serial number: 864dbf0fe35ed77d8ed8 -Valid from: Sun Feb 18 18:30:00 GMT 2018 until: Wed Feb 18 18:30:00 GMT 2043 -Signature algorithm name: SHA384withRSA -Subject Public Key Algorithm: 4096-bit RSA key -Version: 3 ------BEGIN CERTIFICATE----- -MIIFlTCCA32gAwIBAgILAIZNvw/jXtd9jtgwDQYJKoZIhvcNAQEMBQAwZzELMAkG -A1UEBhMCSU4xEzARBgNVBAsTCmVtU2lnbiBQS0kxJTAjBgNVBAoTHGVNdWRocmEg -VGVjaG5vbG9naWVzIExpbWl0ZWQxHDAaBgNVBAMTE2VtU2lnbiBSb290IENBIC0g -RzIwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBnMQswCQYDVQQGEwJJ -TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s -b2dpZXMgTGltaXRlZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMjCCAiIw -DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMNwGIWW2kHfHK+sXTNwxF07K+IV -ySTuyFM2r1v002wUfcdT+zs5OM5QbMYFFnedXQI6gCFLsjKrcaej48Zt37OyEb3i -aPs7CsP4kAyTwzKH9aZe6gXYHrJq40/ZVMNcQVI2PcIp40B/SAN2gUZ+ZaUtIOvV -jEx26/ebNaXRIsthlkOG/caB+QRwDw1tl7338Zlv0M2oTBUy4B3e7dGP5pgXH71M -jqHPCoNo+xv9f0NTBT+hUDa8h8wUtcGQq9CDeJTpjWcD2bP2AMdVG6oVpMAUeUzo -cCyglvtFdUMjggxBbw4qhau1HXPG8Ot9hwL7ZMi8tkTzrvUIxxb8G9LF/7kKeCE7 -tGZaVzDTnXuifl3msR4ErHsQ4P7lVu2AIjIAhrAXoedDidb7pMcf7TABdrYUT1Jo -G/AiK+J9jO6GTjeADD4LMDSBZhHMuBK/PJ/g0kGBt+/C1L+/HURzQhJkMlRnM6Rv -XoCtfKopSlns5trZmTi971Wjbn88QXP61lGpBCUPwCjs7rpOYvSUJtI+lcbF+37q -kIqOXYkVT3cupDSpw+H89kFtj5GKY+Xny4LxY+3IvDIRiyd6ky1DPj713DI0yqve -EpsIr3A0PdwuyUI7CS1jg0NnGFT6Xxyr0xB+VDt83FJYW8v16k2pbaQ4kVxA3aXd -X9dZYyVR1S59KM75AgMBAAGjQjBAMB0GA1UdDgQWBBTt7E1FYRgo57MjKBEcTaUn -DV7s9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B -AQwFAAOCAgEACFC/ilQg8KTCVBxFJW/sazomkS0kNYbEIZg4B3obqwsJ7SX98z8Z -gfzBpz0nYClwwJjWbFN1R2zY8pCEot6/dgmA8Vbq0GxhwPM5YN/SZquNyRIxO3cU -dlAcwf+vSezdVCf9wOzvSAF3q0a5ljvbdbNJNpfScQVp7UUd5sBsZk8jXO1KQ/go -/Vf/GDPnrIFmxpAIGE3sgnO8lAv9FzUaAeuv7HWe47xN9J7+bQzF93yHuIXACPTL -pQHhg2zMv5C7BAbuDHfbj1Cu294Z832yhSfBcziWGskOvl3es2EcHytbS9c9P+0z -Mpka7zGC1FHrvLb/FoduH86TeZt0QjZ6pcplNzoaxDnDvzTJ6CC2Eny+qH/APFCu -VUv5/wjwF+HPm8Pup2ARj9cEp92+0qcerfHacNq5hMeGZdbA/dzdUR/5z5zXdxAk -nl8mcfGb0eMNSTXQmmB/i4AecNnr72uYjzlaXUGYN7Nrb6XouG0pnh0/BBtWWp0U -ShIPpWEAqs7RJBj6+1ZUYXZ4ObrCw962DxhN2p19Hxw9LtuUUcLqqTPrFXYvwO4t -ouj7KJnAkaTUfXGdEaFVtFig1EA30WzJY2X1vAQ7hVnniCjgaXAGqjsU6sklNM9n -xDx5rFCCCEtj9Kh8UHjGK2QqgP5kwgttjOApQMaCoezMfK4KD7WpOXU= ------END CERTIFICATE----- diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/VERSION openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/VERSION --- openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/VERSION 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/VERSION 2026-11-15 23:20:43.000000000 +0000 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2026e +tzdata2026f diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/leapseconds openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/leapseconds --- openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/leapseconds 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/leapseconds 2026-11-15 23:20:43.000000000 +0000 @@ -21,7 +21,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -# Allowance for leap seconds added to each time zone file. +# Leap seconds (1972-2016) optionally added to TZif files. # This file is in the public domain. @@ -29,7 +29,7 @@ # NIST/IERS format leap-seconds.list file, which can be copied from # # or via a less-secure protocol and with different comments and -# less volatile last-modified and expiration timestamps, from +# less volatile timestamp metadata, from # . # For more about leap-seconds.list, please see # The NTP Timescale and Leap Seconds @@ -41,10 +41,8 @@ # (ITU-R) Recommendation TF.460-6 (02/2002) # . # The International Earth Rotation and Reference Systems Service (IERS) -# periodically uses leap seconds to keep UTC to within 0.9 s of UT1 -# (a proxy for Earth's angle in space as measured by astronomers) -# and publishes leap second data in a copyrighted file -# . +# periodically used leap seconds to keep UTC to within 0.9 s of UT1 +# (a proxy for Earth's angle in space as measured by astronomers). # See: Levine J. Coordinated Universal Time and the leap second. # URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995 # . @@ -56,8 +54,8 @@ # of UTC. # All leap-seconds are Stationary (S) at the given UTC time. -# The correction (+ or -) is made at the given time, so in the unlikely -# event of a negative leap second, a line would look like this: +# The correction (+ or -) is made at the given time, so if a negative +# leap second had ever occurred, a line would have looked like this: # Leap YEAR MON DAY 23:59:59 - S # Typical lines look like this: # Leap YEAR MON DAY 23:59:60 + S @@ -90,8 +88,9 @@ Leap 2016 Dec 31 23:59:60 + S # UTC timestamp when this leap second list expires. -# Any additional leap seconds will come after this. -# This Expires line is commented out for now, +# The idea was that any additional leap seconds would come after this. +# This timestamp is obsolete as there will be no more leap seconds. +# This Expires line is commented out, to avoid confusion, and # so that pre-2020a zic implementations do not reject this file. #Expires 2027 Jun 28 00:00:00 @@ -99,10 +98,9 @@ # "#updated" gives the last time the leap seconds data changed # or, if this file was derived from the IERS leap-seconds.list, # the last time that file changed in any way. -# "#expires" gives the first time this file might be wrong; -# if this file was derived from the IERS leap-seconds.list, -# this is typically a bit less than one year after "updated". #updated 1783323897 (2026-07-06 07:44:57 UTC) +# "#expires" gives the first time this file might be wrong. +# This timestamp is obsolete as there will be no more leap seconds. #expires 1814140800 (2027-06-28 00:00:00 UTC) # Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat) diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/northamerica openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/northamerica --- openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/northamerica 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/northamerica 2026-11-15 23:20:43.000000000 +0000 @@ -1775,16 +1775,11 @@ # been aligned with neighboring Manitoba and use America/Winnipeg, in # accordance with section 2(2) of Ontario's Time Act, RSO 1990 chapter T.9: # https://www.ontario.ca/laws/statute/90t09 -# With Manitoba now opting to stay on -05 year-round, if any of these areas do -# not follow, it would require a new zone; however, given the short leadtime -# ahead of a potential divergence on 2026-11-01 and in the interest of not -# creating zones that may not be needed, assume for the time being that they -# will. # # In practice, there are several exceptions to the 90°W dividing line set by # the province, all of which technically contravene the official Ontario rules: -# - An area around Big Trout Lake in Kenora District observes Central Time -# (-06/-05) despite extending east of 90°W. +# - An area around Big Trout Lake in Kenora District aligns with +# America/Winnipeg despite extending east of 90°W. # - An area around Upsala in the southwest of Thunder Bay District observes # Eastern Time (-05/-04) like America/Toronto despite extending west of # 90°W. @@ -1796,9 +1791,27 @@ # 1998, though it is less clear how far back that arrangement goes; assume # the area is covered in the same way as Atikokan. # See the 'backzone' file for further commentary. -# At time of writing, it is not yet known to what extent Manitoba's 2026-09-17 -# announcement may spur further adaptations in northwestern Ontario; see -# Manitoba, below. +# +# From Tim Parenti (2026-10-13): +# On 2026-09-17, after neighboring Manitoba announced a shift to year-round -05 +# (see Manitoba, below), local leaders throughout northwestern Ontario +# coordinated regionally alongside their local members of provincial parliament +# to swiftly conduct several local surveys on the matter ahead of a potential +# divergence on 2026-11-01. All of the surveys returned more than 90% support +# for remaining in alignment with the “Manitoba model”. +# https://www.nwonewswatch.com/local-journalism-initiative-lji/vast-majority-want-to-end-time-changes-mayor-12838025 +# https://www.kenoraminerandnews.com/news/local-news/kenora-asks-province-to-end-clock-changes/article_5118b819-9f67-42ce-938a-1478b8ab541e.html +# From Aoun Khan and Chris Walton (2026-10-13): +# Ontario is set to move parts of the province’s northwest region to permanent +# daylight time in order to align with Manitoba. +# https://www.cp24.com/news/canada/2026/10/13/ontario-to-move-northwest-regions-to-permanent-daylight-time/ +# The provincial government has issued a written news release: +# https://news.ontario.ca/en/release/1008130/ontario-moving-to-permanent-daylight-saving-time-in-parts-of-northwestern-ontario +# From Heitor David Pinto (2026-10-22): +# [On 2026-10-19] the government of Ontario issued [Regulation 333/26] setting +# the time in the part of the province west of 90°W as UTC-5 all year. It +# comes into force on 1 November 2026. +# https://www.ontario.ca/laws/regulation/r26333 # Manitoba @@ -1976,13 +1989,13 @@ # which can be prescribed by regulation "if it is in the provincial interest" # for those areas to observe either "UTC-5, UTC-6 or UTC-7 for all or part of # the year" on at least 30 days' notice. -# The new Act comes into force by order of the Lieutenant Governor in Council. -# From Tim Parenti (2026-09-21): -# With Manitoba now adopting year-round -05, the area around Creighton will -# likely wish to follow. As the area doesn't have a special charter like -# Lloydminster, the existing de facto arrangement technically violates -# provincial law already, but once the new Act takes effect it will better -# allow for continued alignment with Manitoba, per the above. +# From Tim Parenti (2026-10-27), per Heitor David Pinto (2026-10-27): +# Order in Council 438/2026 brings the new Act into force from 2026-10-30. +# https://publications.saskatchewan.ca/#/products/130175 +# This should allow the area around Creighton to more straightforwardly remain +# aligned with Manitoba on year-round -05, since its previous de facto +# arrangement technically violated provincial law without a special charter +# like Lloydminster. # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Regina 1918 only - Apr 14 2:00 1:00 D @@ -2194,7 +2207,7 @@ # 2026-08-14 meeting. # https://www.cbc.ca/news/canada/british-columbia/east-kootenay-stops-changing-clocks-9.7308201 # -# From Tim Parenti (2026-09-24): +# From Tim Parenti (2026-10-15): # Echoing RDEK’s earlier false step, the Town of Golden initially opted for # year-round -07 by a 4–2 Council vote on 2026-09-01. This was met with # significant pushback from residents preferring to maintain the existing @@ -2208,9 +2221,10 @@ # school”, the new resolution directs town staff to partner on safety supports # and commits to reviewing the decision and its impacts in October 2027. # https://www.ctvnews.ca/calgary/article/golden-bc-council-reverses-course-on-time-zone-opts-for-mountain-daylight-time/ -# At time of writing, the surrounding CSRD Area A is yet to formalize its own -# decision following a 2026-09-10 deferral “to gather and assess further -# information”, but is expected to follow. +# Following a 2026-09-10 deferral “to gather and assess further information” in +# light of the ongoing petition, the surrounding CSRD Area A unanimously +# formalized its own change on 2026-10-15 in order to maintain the alignment. +# https://www.csrd.bc.ca/m/newsflash/home/detail/2486 # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Vanc 1918 only - Apr 14 2:00 1:00 D @@ -3557,6 +3571,17 @@ # From Paul Eggert (2012-11-03): # For now, assume the future rule is first Sunday in November. +# From an anonymous contributor (2026-10-24): +# On October 24, 2026, the Cuban authorities announced that daylight saving +# time would remain in effect until November 7, 2027, suspending the usual +# return to standard time scheduled for November 1, 2026. +# From Tim Parenti (2026-10-26): +# The measure delays the start times for schools and workplaces by 30 minutes +# during the period in which standard time would normally be in effect "to +# avoid disrupting social activities during the early part of the day". +# http://www.cuba.cu/otras/2026-10-25/cuba-mantendra-horario-de-verano-hasta-noviembre-de-2027/69459 +# https://en.cibercuba.com/noticias/2026-10-24-u1-e74-s27061-nid343708-cuba-mantendra-horario-verano-noviembre-2027-retrasara + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -3595,8 +3620,10 @@ Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D Rule Cuba 2011 only - Nov 13 0:00s 0 S Rule Cuba 2012 only - Apr 1 0:00s 1:00 D -Rule Cuba 2012 max - Nov Sun>=1 0:00s 0 S -Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2012 2025 - Nov Sun>=1 0:00s 0 S +Rule Cuba 2013 2026 - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2027 max - Nov Sun>=1 0:00s 0 S +Rule Cuba 2028 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/southamerica openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/southamerica --- openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/southamerica 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/southamerica 2026-11-15 23:20:43.000000000 +0000 @@ -801,11 +801,21 @@ # From Paul Eggert (2013-10-17): # For now, assume western Amazonas will change as well. +# From Daniel Dias Rodrigues (2026-10-20): +# Under Brazilian law, a period stated as "until day X" includes day X. +# From Tim Parenti (2026-10-27): +# With the decrees explicitly naming the hour of 01:00 for only a few fall back +# transitions, there remains some ambiguity in whether other implied midnight +# fall back transitions may have therefore been intended as 24:00s (i.e., +# 25:00 -> 24:00) rather than as 24:00 (24:00 -> 23:00), particularly prior to +# 1966. Since contemporaneous reporting was somewhat inconsistent on this, +# minimize changes from earlier tzdb versions where there is ambiguity. + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S # Decree 20,466 (1931-10-01) # Decree 21,896 (1932-01-10) Rule Brazil 1931 only - Oct 3 11:00 1:00 - -Rule Brazil 1932 1933 - Apr 1 0:00 0 - +Rule Brazil 1932 1933 - Mar 31 24:00 0 - Rule Brazil 1932 only - Oct 3 0:00 1:00 - # Decree 23,195 (1933-10-10) # revoked DST. @@ -813,28 +823,32 @@ # Decree 27,998 (1950-04-13) Rule Brazil 1949 1952 - Dec 1 0:00 1:00 - Rule Brazil 1950 only - Apr 16 1:00 0 - -Rule Brazil 1951 1952 - Apr 1 0:00 0 - +Rule Brazil 1951 1952 - Mar 31 24:00 0 - # Decree 32,308 (1953-02-24) -Rule Brazil 1953 only - Mar 1 0:00 0 - +Rule Brazil 1953 only - Feb 28 24:00 0 - # Decree 34,724 (1953-11-30) # revoked DST. # Decree 52,700 (1963-10-18) -# established DST from 1963-10-23 00:00 to 1964-02-29 00:00 -# in SP, RJ, GB, MG, ES, due to the prolongation of the drought. +# established DST as an "Hora Especial" from 1963-10-23 00:00 in SP, RJ, GB, +# MG, ES, due to the prolongation of the drought. It originally specified an +# end date of 1964-02-29 24:00. # Decree 53,071 (1963-12-03) -# extended the above decree to all of the national territory on 12-09. +# extended DST as a usual "hora de verão" to all of the national territory from +# 1963-12-09 and would have extended its end date to 1964-03-31 24:00. Rule Brazil 1963 only - Dec 9 0:00 1:00 - # Decree 53,604 (1964-02-25) -# extended summer time by one day to 1964-03-01 00:00 (start of school). +# restored the original end date of 1964-03-01 00:00 due to the start of +# school. Rule Brazil 1964 only - Mar 1 0:00 0 - # Decree 55,639 (1965-01-27) Rule Brazil 1965 only - Jan 31 0:00 1:00 - -Rule Brazil 1965 only - Mar 31 0:00 0 - +Rule Brazil 1965 only - Mar 31 24:00 0 - # Decree 57,303 (1965-11-22) -Rule Brazil 1965 only - Dec 1 0:00 1:00 - +Rule Brazil 1965 only - Nov 30 24:00 1:00 - # Decree 57,843 (1966-02-18) -Rule Brazil 1966 1968 - Mar 1 0:00 0 - +Rule Brazil 1966 only - Mar 1 1:00 0 - Rule Brazil 1966 1967 - Nov 1 0:00 1:00 - +Rule Brazil 1967 1968 - Mar 1 0:00 0 - # Decree 63,429 (1968-10-15) # revoked DST. # Decree 91,698 (1985-09-27) @@ -1063,6 +1077,7 @@ # Goiás (GO), Distrito Federal (DF), Minas Gerais (MG), # Espírito Santo (ES), Rio de Janeiro (RJ), São Paulo (SP), Paraná (PR), # Santa Catarina (SC), Rio Grande do Sul (RS) +# The 1963 date is for MG, ES, RJ, SP; others started DST on 1963-12-09. Zone America/Sao_Paulo -3:06:28 - LMT 1914 -3:00 Brazil %z 1963 Oct 23 0:00 -3:00 1:00 %z 1964 diff -Nru openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/zone.tab openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/zone.tab --- openjdk-21-21.0.13+9/src/java.base/share/data/tzdata/zone.tab 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.base/share/data/tzdata/zone.tab 2026-11-15 23:20:43.000000000 +0000 @@ -139,7 +139,7 @@ CA +4339-07923 America/Toronto Eastern - ON & QC (most areas) CA +6344-06828 America/Iqaluit Eastern - NU (most areas) CA +484531-0913718 America/Atikokan EST - ON (Atikokan), NU (Coral H) -CA +4953-09709 America/Winnipeg EST - ON (west), Manitoba +CA +4953-09709 America/Winnipeg EST - Manitoba, ON (northwest) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/legal/freetype.md openjdk-21-21.0.13.1+2/src/java.desktop/share/legal/freetype.md --- openjdk-21-21.0.13+9/src/java.desktop/share/legal/freetype.md 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.desktop/share/legal/freetype.md 2026-11-15 23:20:43.000000000 +0000 @@ -1,4 +1,4 @@ -## The FreeType Project: Freetype v2.14.3 +## The FreeType Project: Freetype v2.15.0 ### FreeType Notice diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/legal/libpng.md openjdk-21-21.0.13.1+2/src/java.desktop/share/legal/libpng.md --- openjdk-21-21.0.13+9/src/java.desktop/share/legal/libpng.md 2026-10-19 12:10:20.000000000 +0000 +++ openjdk-21-21.0.13.1+2/src/java.desktop/share/legal/libpng.md 2026-11-15 23:20:43.000000000 +0000 @@ -1,4 +1,4 @@ -## libpng v1.6.58 +## libpng v1.6.59 ### libpng License
@@ -160,6 +160,7 @@
  * Adam Richter
  * Alexander Smorkalov
  * Andreas Dilger
+ * Anthony Hurtado
  * Chris Blume
  * Cosmin Truta
  * Dave Martindale
@@ -197,6 +198,7 @@
  * Vadim Barkov
  * Willem van Schaik
  * Yuelin Wang (王跃林)
+ * Yuki Sekiguchi
  * Zhijie Liang
  * Apple Inc.
     - Zixu Wang (王子旭)
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h	2026-11-15 23:20:43.000000000 +0000
@@ -15,6 +15,7 @@
 FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
 FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
 FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
+// FT_USE_MODULE( FT_Driver_ClassRec, hvf_driver_class )
 // FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
 // FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
 // FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h	2026-11-15 23:20:43.000000000 +0000
@@ -336,6 +336,22 @@
 
   /**************************************************************************
    *
+   * HVF support.
+   *
+   *   FreeType can use Apple's HVF (Hierarchical Variable Font) library
+   *   to render glyphs from fonts containing 'hvgl' tables.
+   *
+   *   Define this macro if you want to enable this 'feature'.
+   *
+   *   If you use a build system like cmake or the `configure` script,
+   *   options set by those programs have precedence, overwriting the value
+   *   here with the configured one.
+   */
+/* #define FT_CONFIG_OPTION_HVF */
+
+
+  /**************************************************************************
+   *
    * Glyph Postscript Names handling
    *
    *   By default, FreeType 2 is compiled with the 'psnames' module.  This
@@ -423,8 +439,10 @@
 
   /**************************************************************************
    *
-   * The size in bytes of the render pool used by the scan-line converter to
-   * do all of its work.
+   * The size in bytes of the stack render pool used by the scan-line
+   * converters.  Use this option to limit the stack usage.  The memory
+   * requirements are proportional to size and complexity of a given glyph.
+   * FreeType's rasterizers switch to dynamic allocations when necessary.
    */
 #define FT_RENDER_POOL_SIZE  16384L
 
@@ -651,6 +669,7 @@
 #define TT_CONFIG_CMAP_FORMAT_12
 #define TT_CONFIG_CMAP_FORMAT_13
 #define TT_CONFIG_CMAP_FORMAT_14
+#define TT_CONFIG_CMAP_FORMAT_15
 
 
   /*************************************************************************/
@@ -757,6 +776,21 @@
 
 
   /**************************************************************************
+   *
+   * Define `TT_CONFIG_OPTION_VARC` if you want to include support for
+   * variable composite glyphs (the 'VARC' table).  This is part of the
+   * 'boring' OpenType specification expansions.
+   *
+   *   https://github.com/harfbuzz/boring-expansion-spec/blob/main/VARC.md
+   *
+   * Variable composites enable more efficient encoding of variable glyphs
+   * by allowing glyphs to be composed from other glyphs with variable
+   * transformations and axis value overrides.
+   */
+/* #define TT_CONFIG_OPTION_VARC */
+
+
+  /**************************************************************************
    *
    * Define `TT_CONFIG_OPTION_BDF` if you want to include support for an
    * embedded 'BDF~' table within an SFNT-based `.otb` font file.  This table
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h	2026-11-15 23:20:43.000000000 +0000
@@ -4134,7 +4134,7 @@
    *   This function returns an error if the charmap is not part of the face
    *   (i.e., if it is not listed in the `face->charmaps` table).
    *
-   *   It also fails if an OpenType type~14 charmap is selected (which
+   *   It also fails if an OpenType type 14 or~15 charmap is selected (which
    *   doesn't map character codes to glyph indices at all).
    */
   FT_EXPORT( FT_Error )
@@ -4700,7 +4700,7 @@
    *
    * @abstract:
    *   The FreeType~2 interface to Unicode Variation Sequences (UVS), using
-   *   the SFNT cmap format~14.
+   *   the SFNT cmap formats 14 and~15.
    *
    * @description:
    *   Many characters, especially for CJK scripts, have variant forms.  They
@@ -4730,9 +4730,10 @@
    *   U+9089, you have to write the character sequence `U+9089 U+E0100`.
    *
    *   Adobe and MS decided to support both standardized and ideographic VS
-   *   with a new cmap subtable (format~14).  It is an odd subtable because
-   *   it is not a mapping of input code points to glyphs, but contains lists
-   *   of all variations supported by the font.
+   *   with a new cmap subtable (format~14, or format~15 for glyph indices
+   *   above 65535).  It is an odd subtable because it is not a mapping of
+   *   input code points to glyphs, but contains lists of all variations
+   *   supported by the font.
    *
    *   A variation may be either 'default' or 'non-default' for a given font.
    *   A default variation is the one you will get for that code point if you
@@ -5168,8 +5169,8 @@
    *
    */
 #define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  14
-#define FREETYPE_PATCH  3
+#define FREETYPE_MINOR  15
+#define FREETYPE_PATCH  0
 
 
   /**************************************************************************
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h	2026-11-15 23:20:43.000000000 +0000
@@ -471,7 +471,7 @@
 
   /* */
 
-#define FT_CURVE_TAG( flag )  ( flag & 0x03 )
+#define FT_CURVE_TAG( flag )  ( ( flag & 0x01 ) ? 0x01 : ( flag & 0x03 ) )
 
   /* see the `tags` field in `FT_Outline` for a description of the values */
 #define FT_CURVE_TAG_ON            0x01
@@ -875,7 +875,7 @@
    */
   typedef struct  FT_Span_
   {
-    unsigned short  x;
+    short           x;
     unsigned short  len;
     unsigned char   coverage;
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h	2026-11-15 23:20:43.000000000 +0000
@@ -172,6 +172,7 @@
   FT_MODERRDEF( Winfonts, 0x1500, "Windows FON/FNT module" )
   FT_MODERRDEF( GXvalid,  0x1600, "GX validation module" )
   FT_MODERRDEF( Sdf,      0x1700, "Signed distance field raster module" )
+  FT_MODERRDEF( HVF,      0x1800, "HVF module" )
 
 
 #ifdef FT_MODERR_END_LIST
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h	2026-11-15 23:20:43.000000000 +0000
@@ -25,8 +25,6 @@
 #include 
 #include 
 
-#include 
-
 
 FT_BEGIN_HEADER
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h	2026-11-15 23:20:43.000000000 +0000
@@ -77,6 +77,10 @@
 #endif /* FT_INT64 */
 
 
+#define ULABS( a )  ( a >= 0 ? (FT_ULong)a : 0UL - (FT_ULong)a )
+#define  UABS( a )  ( a >= 0 ?  (FT_UInt)a : 0U  -  (FT_UInt)a )
+
+
   /**************************************************************************
    *
    * FT_MulDiv() and FT_MulFix() are declared in freetype.h.
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h	2026-11-15 23:20:43.000000000 +0000
@@ -33,6 +33,7 @@
 
 #ifdef FT_DEBUG_LOGGING
 #define DLG_STATIC
+#define DLG_LOG_LEVEL  dlg_level_trace
 #include 
 #include 
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h	2026-11-15 23:20:43.000000000 +0000
@@ -71,6 +71,13 @@
     FT_UInt       regionCount;          /* total number of regions defined */
     GX_VarRegion  varRegionList;
 
+    /* Cache of per-region scalars for the current normalized coordinates. */
+    /* `regionScalars` holds `regionCount` values, `cachedCoords` the      */
+    /* `axisCount` coordinates they were computed for; both are NULL until */
+    /* first use and recomputed whenever the coordinates change.           */
+    FT_Fixed*  regionScalars;
+    FT_Fixed*  cachedCoords;
+
   } GX_ItemVarStoreRec, *GX_ItemVarStore;
 
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h	2026-11-15 23:20:43.000000000 +0000
@@ -214,8 +214,8 @@
     FT_CMap_CharIndexFunc  char_index;
     FT_CMap_CharNextFunc   char_next;
 
-    /* Subsequent entries are special ones for format 14 -- the variant */
-    /* selector subtable which behaves like no other                    */
+    /* Subsequent entries are special ones for formats 14 and 15 -- */
+    /* the variant selector subtables which behave like no other    */
 
     FT_CMap_CharVarIndexFunc      char_var_index;
     FT_CMap_CharVarIsDefaultFunc  char_var_default;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h	2026-11-15 23:20:43.000000000 +0000
@@ -173,6 +173,7 @@
    *   FT_DEFINE_SERVICEDESCREC8
    *   FT_DEFINE_SERVICEDESCREC9
    *   FT_DEFINE_SERVICEDESCREC10
+   *   FT_DEFINE_SERVICEDESCREC11
    *
    * @description:
    *   Used to initialize an array of FT_ServiceDescRec structures.
@@ -350,6 +351,34 @@
     { NULL, NULL }                                                          \
   };
 
+#define FT_DEFINE_SERVICEDESCREC11( class_,                                 \
+                                    serv_id_1, serv_data_1,                 \
+                                    serv_id_2, serv_data_2,                 \
+                                    serv_id_3, serv_data_3,                 \
+                                    serv_id_4, serv_data_4,                 \
+                                    serv_id_5, serv_data_5,                 \
+                                    serv_id_6, serv_data_6,                 \
+                                    serv_id_7, serv_data_7,                 \
+                                    serv_id_8, serv_data_8,                 \
+                                    serv_id_9, serv_data_9,                 \
+                                    serv_id_10, serv_data_10,               \
+                                    serv_id_11, serv_data_11 )              \
+  static const FT_ServiceDescRec  class_[] =                                \
+  {                                                                         \
+    { serv_id_1, serv_data_1 },                                             \
+    { serv_id_2, serv_data_2 },                                             \
+    { serv_id_3, serv_data_3 },                                             \
+    { serv_id_4, serv_data_4 },                                             \
+    { serv_id_5, serv_data_5 },                                             \
+    { serv_id_6, serv_data_6 },                                             \
+    { serv_id_7, serv_data_7 },                                             \
+    { serv_id_8, serv_data_8 },                                             \
+    { serv_id_9, serv_data_9 },                                             \
+    { serv_id_10, serv_data_10 },                                           \
+    { serv_id_11, serv_data_11 },                                           \
+    { NULL, NULL }                                                          \
+  };
+
 
   /*
    * Parse a list of FT_ServiceDescRec descriptors and look for a specific
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h	2026-11-15 23:20:43.000000000 +0000
@@ -79,6 +79,7 @@
 FT_TRACE_DEF( ttinterp )  /* bytecode interpreter    (ttinterp.c) */
 FT_TRACE_DEF( ttobjs )    /* TT objects manager      (ttobjs.c)   */
 FT_TRACE_DEF( ttpload )   /* TT data/program loader  (ttpload.c)  */
+FT_TRACE_DEF( ttvarc )    /* TT VARC handler         (ttvarc.c)   */
 
   /* Type 1 driver components */
 FT_TRACE_DEF( t1afm )
@@ -120,6 +121,11 @@
 FT_TRACE_DEF( cidobjs )
 FT_TRACE_DEF( cidparse )
 
+  /* HVF driver component */
+FT_TRACE_DEF( hvfdrv )
+FT_TRACE_DEF( hvfobjs )
+FT_TRACE_DEF( hvfload )
+
   /* Windows font component */
 FT_TRACE_DEF( winfnt )
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h	2026-11-15 23:20:43.000000000 +0000
@@ -40,6 +40,7 @@
 #define FT_FONT_FORMAT_TYPE_42   "Type 42"
 #define FT_FONT_FORMAT_CID       "CID Type 1"
 #define FT_FONT_FORMAT_CFF       "CFF"
+#define FT_FONT_FORMAT_HVF       "HVF"
 #define FT_FONT_FORMAT_PFR       "PFR"
 #define FT_FONT_FORMAT_WINFNT    "Windows FNT"
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h	2026-11-15 23:20:43.000000000 +0000
@@ -52,7 +52,8 @@
    *     table), 2~(high-byte mapping through table), 4~(segment mapping to
    *     delta values), 6~(trimmed table mapping), 8~(mixed 16-bit and 32-bit
    *     coverage), 10~(trimmed array), 12~(segmented coverage), 13~(last
-   *     resort font), and 14 (Unicode Variation Sequences).
+   *     resort font), 14~(Unicode Variation Sequences), and 15~(extended
+   *     glyph repertoire Unicode Variation Sequences).
    */
   typedef struct  TT_CMapInfo_
   {
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h	2026-11-15 23:20:43.000000000 +0000
@@ -1130,11 +1130,29 @@
    *     The font's horizontal header ('hhea' table).  This field also
    *     contains the associated horizontal metrics table ('hmtx').
    *
+   *   horz_metrics_count ::
+   *     The number of horizontal metrics.  This can be larger than the
+   *     public `TT_HoriHeader.number_Of_HMetrics` field when the font uses
+   *     the 'HHEA table (instead of 'hhea').
+   *
+   *   horz_metrics_is_extended ::
+   *     A boolean which is set when the font uses 'HHEA' and 'HMTX' tables
+   *     (instead of 'hhea' and 'hmtx').
+   *
    *   max_profile ::
    *     The font's maximum profile table.  Read on font opening.  Note that
    *     some maximum values cannot be taken directly from this table.  We
    *     thus define additional fields below to hold the computed maxima.
    *
+   *   maxp_num_glyphs ::
+   *     The glyph count from the font's maximum profile table.  This can be
+   *     larger than the public `TT_MaxProfile.numGlyphs` field when the font
+   *     uses the 24-bit 'MAXP' table.
+   *
+   *   is_extended_glyf ::
+   *     A boolean which is set when the font uses the 'GLYF' and 'LOCA'
+   *     tables (extending 'glyf' and 'loca', respectively).
+   *
    *   vertical_info ::
    *     A boolean which is set when the font file contains vertical metrics.
    *     If not, the value of the 'vertical' field is undefined.
@@ -1145,6 +1163,15 @@
    *     IMPORTANT: The contents of this field is undefined if the
    *     `vertical_info` field is unset.
    *
+   *   vert_metrics_count ::
+   *     The number of vertical metrics.  This can be larger than the public
+   *     `TT_VertHeader.number_Of_VMetrics` field when the font uses the
+   *     'VHEA' table (instead of 'vhea').
+   *
+   *   vert_metrics_is_extended ::
+   *     A boolean which is set when the font uses the 'VHEA' and 'VMTX'
+   *     tables (instead of 'vhea' and 'vmtx').
+   *
    *   num_names ::
    *     The number of name records within this TrueType font.
    *
@@ -1166,6 +1193,25 @@
    *   cmap_size ::
    *     The size in bytes of the `cmap_table` described above.
    *
+   *   dmap_table ::
+   *     Address of the face's 'DMAP' SFNT table in memory (it's an extracted
+   *     frame).
+   *
+   *   dmap_size ::
+   *     The size in bytes of the `dmap_table` described above.
+   *
+   *   dmap_charmaps ::
+   *     The array of 'DMAP' charmaps.
+   *
+   *   num_dmap_charmaps ::
+   *     The number of elements in `dmap_charmaps`.
+   *
+   *   dmap_results ::
+   *     An array used while merging a dmap with its corresponding cmap.
+   *
+   *   dmap_max_results ::
+   *     The current size of `dmap_results`.
+   *
    *   goto_table ::
    *     A function called by each TrueType table loader to position a
    *     stream's cursor to the start of a given table according to its tag.
@@ -1209,6 +1255,13 @@
    *     A pointer to the Metrics Variations service for this `TT_Face`'s
    *     driver.
    *
+   *   tt_varc ::
+   *     A pointer for sharing the VARC services provided by this
+   *     `TT_Face`'s driver.
+   *
+   *   face_varc ::
+   *     A pointer to handle VARC glyphs by this `TT_Face`'s driver.
+   *
    *   psaux ::
    *     A pointer to the PostScript Auxiliary service.
    *
@@ -1408,6 +1461,26 @@
    *   svg ::
    *     A pointer to data related to the 'SVG' table.  `NULL` if the table
    *     is not available.
+   *
+   *   gpos_table ::
+   *     A pointer to the 'GPOS' table.  `NULL` if the table is not
+   *     available.
+   *
+   *   gpos_lookups_kerning ::
+   *     An array of GPOS kerning lookups.
+   *
+   *   num_gpos_lookups_kerning ::
+   *     The number of GPOS kerning lookups.
+   *
+   *   varc ::
+   *     A pointer to data related to the 'VARC' table.  `NULL` if the table
+   *     is not available.
+   *
+   *   varc_context ::
+   *     A context to manage recursion in the 'VARC' table.
+   *
+   *   varc_loading_components ::
+   *     Set if component checks for 'VARC' table handling can be skipped.
    */
   typedef struct  TT_FaceRec_
   {
@@ -1421,11 +1494,17 @@
 
     TT_Header             header;       /* TrueType header table          */
     TT_HoriHeader         horizontal;   /* TrueType horizontal header     */
+    FT_UInt32             horz_metrics_count;
+    FT_Bool               horz_metrics_is_extended;
 
     TT_MaxProfile         max_profile;
+    FT_UInt               maxp_num_glyphs;
+    FT_Bool               is_extended_glyf;
 
     FT_Bool               vertical_info;
     TT_VertHeader         vertical;     /* TT Vertical header, if present */
+    FT_UInt32             vert_metrics_count;
+    FT_Bool               vert_metrics_is_extended;
 
     FT_UShort             num_names;    /* number of name records  */
     TT_NameTableRec       name_table;   /* name table              */
@@ -1436,6 +1515,13 @@
     FT_Byte*              cmap_table;   /* extracted `cmap' table */
     FT_ULong              cmap_size;
 
+    FT_Byte*              dmap_table;   /* extracted 'DMAP' table */
+    FT_ULong              dmap_size;
+    FT_CMap*              dmap_charmaps;
+    FT_UInt               num_dmap_charmaps;
+    FT_UInt32*            dmap_results;
+    FT_UInt32             dmap_max_results;
+
     TT_Loader_GotoTableFunc   goto_table;
 
     TT_Loader_StartGlyphFunc  access_glyph_frame;
@@ -1468,6 +1554,16 @@
     void*                 face_var;             /* since 2.13.1 */
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+    /* a typeless pointer to the FT_Service_VARCRec table used to */
+    /* share VARC handling from the `truetype' driver             */
+    void*                 tt_varc;              /* since 2.15 */
+
+    /* a typeless pointer to the FT_Service_VARCRec table used to */
+    /* handle VARC glyphs by this TT_Face's driver                */
+    void*                 face_varc;            /* since 2.15 */
+#endif
+
     /* a typeless pointer to the PostScript Aux service */
     void*                 psaux;
 
@@ -1553,7 +1649,7 @@
     FT_ULong              horz_metrics_size;
     FT_ULong              vert_metrics_size;
 
-    FT_ULong              num_locations; /* up to 0xFFFF + 1 */
+    FT_ULong              num_locations; /* up to 0xFFFFFF + 1 */
     FT_Byte*              glyph_locations;
 
     FT_Byte*              hdmx_table;
@@ -1604,6 +1700,15 @@
     FT_UInt               num_gpos_lookups_kerning;
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+    /* since 2.15 */
+    void*                 varc;
+    /* Active recursion context. */
+    void*                 varc_context;
+    /* Whether to skip VARC check for components. */
+    FT_Bool               varc_loading_components;
+#endif
+
   } TT_FaceRec;
 
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h	2026-11-15 23:20:43.000000000 +0000
@@ -49,6 +49,7 @@
 #define TTAG_CPAL  FT_MAKE_TAG( 'C', 'P', 'A', 'L' )
 #define TTAG_cvar  FT_MAKE_TAG( 'c', 'v', 'a', 'r' )
 #define TTAG_cvt   FT_MAKE_TAG( 'c', 'v', 't', ' ' )
+#define TTAG_DMAP  FT_MAKE_TAG( 'D', 'M', 'A', 'P' )
 #define TTAG_DSIG  FT_MAKE_TAG( 'D', 'S', 'I', 'G' )
 #define TTAG_EBDT  FT_MAKE_TAG( 'E', 'B', 'D', 'T' )
 #define TTAG_EBLC  FT_MAKE_TAG( 'E', 'B', 'L', 'C' )
@@ -60,23 +61,31 @@
 #define TTAG_gasp  FT_MAKE_TAG( 'g', 'a', 's', 'p' )
 #define TTAG_GDEF  FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
 #define TTAG_glyf  FT_MAKE_TAG( 'g', 'l', 'y', 'f' )
+#define TTAG_GLYF  FT_MAKE_TAG( 'G', 'L', 'Y', 'F' )
 #define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
 #define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
 #define TTAG_gvar  FT_MAKE_TAG( 'g', 'v', 'a', 'r' )
+#define TTAG_GVAR  FT_MAKE_TAG( 'G', 'V', 'A', 'R' )
 #define TTAG_HVAR  FT_MAKE_TAG( 'H', 'V', 'A', 'R' )
 #define TTAG_hdmx  FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
 #define TTAG_head  FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
 #define TTAG_hhea  FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
+#define TTAG_HHEA  FT_MAKE_TAG( 'H', 'H', 'E', 'A' )
 #define TTAG_hmtx  FT_MAKE_TAG( 'h', 'm', 't', 'x' )
+#define TTAG_HMTX  FT_MAKE_TAG( 'H', 'M', 'T', 'X' )
+#define TTAG_hvgl  FT_MAKE_TAG( 'h', 'v', 'g', 'l' )
+#define TTAG_hvpm  FT_MAKE_TAG( 'h', 'v', 'p', 'm' )
 #define TTAG_JSTF  FT_MAKE_TAG( 'J', 'S', 'T', 'F' )
 #define TTAG_just  FT_MAKE_TAG( 'j', 'u', 's', 't' )
 #define TTAG_kern  FT_MAKE_TAG( 'k', 'e', 'r', 'n' )
 #define TTAG_lcar  FT_MAKE_TAG( 'l', 'c', 'a', 'r' )
 #define TTAG_loca  FT_MAKE_TAG( 'l', 'o', 'c', 'a' )
+#define TTAG_LOCA  FT_MAKE_TAG( 'L', 'O', 'C', 'A' )
 #define TTAG_LTSH  FT_MAKE_TAG( 'L', 'T', 'S', 'H' )
 #define TTAG_LWFN  FT_MAKE_TAG( 'L', 'W', 'F', 'N' )
 #define TTAG_MATH  FT_MAKE_TAG( 'M', 'A', 'T', 'H' )
 #define TTAG_maxp  FT_MAKE_TAG( 'm', 'a', 'x', 'p' )
+#define TTAG_MAXP  FT_MAKE_TAG( 'M', 'A', 'X', 'P' )
 #define TTAG_META  FT_MAKE_TAG( 'M', 'E', 'T', 'A' )
 #define TTAG_MMFX  FT_MAKE_TAG( 'M', 'M', 'F', 'X' )
 #define TTAG_MMSD  FT_MAKE_TAG( 'M', 'M', 'S', 'D' )
@@ -104,7 +113,10 @@
 #define TTAG_typ1  FT_MAKE_TAG( 't', 'y', 'p', '1' )
 #define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
 #define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
+#define TTAG_VHEA  FT_MAKE_TAG( 'V', 'H', 'E', 'A' )
 #define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
+#define TTAG_VMTX  FT_MAKE_TAG( 'V', 'M', 'T', 'X' )
+#define TTAG_VARC  FT_MAKE_TAG( 'V', 'A', 'R', 'C' )
 #define TTAG_VVAR  FT_MAKE_TAG( 'V', 'V', 'A', 'R' )
 #define TTAG_wOFF  FT_MAKE_TAG( 'w', 'O', 'F', 'F' )
 #define TTAG_wOF2  FT_MAKE_TAG( 'w', 'O', 'F', '2' )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c	2026-11-15 23:20:43.000000000 +0000
@@ -2783,8 +2783,8 @@
     {
       do
       {
-        point->y += movement;
-        point     = point->next;
+        point->y = ADD_LONG( point->y, movement );
+        point    = point->next;
 
       } while ( point != first_point );
     }
@@ -3739,7 +3739,7 @@
 
         pos = ADD_LONG( high_min_y, adjustment_amount );
         if ( adjust_below_top && is_top_tilde )
-          pos += high_height;
+          pos = ADD_LONG( pos, high_height );
 
         if ( pos % 64 == 0 && tilde_height < 3 * 64 )
         {
@@ -3892,7 +3892,7 @@
 
         pos = SUB_LONG( low_max_y, adjustment_amount );
         if ( adjust_above_bottom && is_bottom_tilde )
-          pos -= low_height;
+          pos = SUB_LONG( pos, low_height );
 
         if ( pos % 64 == 0 && tilde_height < 3 * 64 )
         {
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c	2026-11-15 23:20:43.000000000 +0000
@@ -104,7 +104,8 @@
     AF_UNIRANGE_REC(  0xFE7A,  0xFE7A ),
     AF_UNIRANGE_REC(  0xFE7C,  0xFE7C ),
     AF_UNIRANGE_REC(  0xFE7E,  0xFE7E ),
-    AF_UNIRANGE_REC( 0x10EFD, 0x10EFF ),
+    AF_UNIRANGE_REC( 0x10ECB, 0x10ECF ),
+    AF_UNIRANGE_REC( 0x10EF0, 0x10EFF ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -118,7 +119,8 @@
 
   const AF_Script_UniRangeRec  af_armn_nonbase_uniranges[] =
   {
-    AF_UNIRANGE_REC(  0x0559,  0x055F ),
+    AF_UNIRANGE_REC(  0x0558,  0x055F ),
+    AF_UNIRANGE_REC(  0x058B,  0x058C ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -156,7 +158,8 @@
 
   const AF_Script_UniRangeRec  af_beng_uniranges[] =
   {
-    AF_UNIRANGE_REC(  0x0980,  0x09FF ),  /* Bengali */
+    AF_UNIRANGE_REC(  0x0980,  0x09FF ),  /* Bengali            */
+    AF_UNIRANGE_REC( 0x11DF0, 0x11DFF ),  /* Bengali Supplement */
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -168,6 +171,7 @@
     AF_UNIRANGE_REC(  0x09CD,  0x09CD ),
     AF_UNIRANGE_REC(  0x09E2,  0x09E3 ),
     AF_UNIRANGE_REC(  0x09FE,  0x09FE ),
+    AF_UNIRANGE_REC( 0x11DF0, 0x11DF0 ),
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -470,7 +474,7 @@
     AF_UNIRANGE_REC(  0x0591,  0x05BF ),
     AF_UNIRANGE_REC(  0x05C1,  0x05C2 ),
     AF_UNIRANGE_REC(  0x05C4,  0x05C5 ),
-    AF_UNIRANGE_REC(  0x05C7,  0x05C7 ),
+    AF_UNIRANGE_REC(  0x05C7,  0x05C9 ),
     AF_UNIRANGE_REC(  0xFB1E,  0xFB1E ),
     AF_UNIRANGE_REC(       0,       0 )
   };
@@ -586,7 +590,7 @@
     AF_UNIRANGE_REC(  0xAB6A,  0xAB6F ),  /* ... continued                          */
     AF_UNIRANGE_REC(  0xFB00,  0xFB06 ),  /* Alphab. Present. Forms (Latin Ligs)    */
     AF_UNIRANGE_REC( 0x1D400, 0x1D7FF ),  /* Mathematical Alphanumeric Symbols      */
-    AF_UNIRANGE_REC( 0x1DF00, 0x1DFFF ),  /* Latin Extended-G                       */
+    AF_UNIRANGE_REC( 0x1DF00, 0x1DFCC ),  /* Latin Extended-G                       */
     AF_UNIRANGE_REC(       0,       0 )
   };
 
@@ -643,7 +647,8 @@
     AF_UNIRANGE_REC(  0xA7F8,  0xA7F9 ),  /* more modifier letters               */
     AF_UNIRANGE_REC(  0xAB5C,  0xAB5F ),  /* more modifier letters               */
     AF_UNIRANGE_REC(  0xAB69,  0xAB69 ),  /* modifier letter small turned w      */
-    AF_UNIRANGE_REC( 0x10780, 0x107FB ),  /* Latin Extended-F                    */
+    AF_UNIRANGE_REC( 0x10780, 0x107BF ),  /* Latin Extended-F                    */
+    AF_UNIRANGE_REC( 0x1DFCD, 0x1DFFF ),  /* Latin Extended-G (subset)           */
     AF_UNIRANGE_REC(       0,       0 )
   };
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c	2026-11-15 23:20:43.000000000 +0000
@@ -45,12 +45,16 @@
    *    that actually do the mapping job.  Please check the OpenType
    *    specification for more details on features and lookups.
    *
-   * 2. Create glyph ID sets from the corresponding lookup sets.
+   * 2. Create glyph ID sets from the corresponding lookup sets.  For
+   *    default coverage, start with glyphs already assigned to the style
+   *    and compute their substitution closure.
    *
    * 3. The glyph set corresponding to AF_COVERAGE_DEFAULT is computed
-   *    with all lookups specific to the OpenType script activated.  It
-   *    relies on the order of AF_DEFINE_STYLE_CLASS entries so that
-   *    special coverages (like `oldstyle figures') don't get overwritten.
+   *    with all lookups specific to the OpenType script activated.  Only
+   *    reachable glyphs are added, since a lookup can be shared by several
+   *    scripts.  It relies on the order of AF_DEFINE_STYLE_CLASS entries
+   *    so that special coverages (like `oldstyle figures') don't get
+   *    overwritten.
    *
    */
 
@@ -198,14 +202,34 @@
       count++;
 #endif
 
-      /* get output coverage of GSUB feature */
-      hb( ot_layout_lookup_collect_glyphs )( face,
-                                             HB_OT_TAG_GSUB,
-                                             idx,
-                                             NULL,
-                                             NULL,
-                                             NULL,
-                                             gsub_glyphs );
+      if ( style_class->coverage != AF_COVERAGE_DEFAULT )
+      {
+        /* get output coverage of GSUB feature */
+        hb( ot_layout_lookup_collect_glyphs )( face,
+                                               HB_OT_TAG_GSUB,
+                                               idx,
+                                               NULL,
+                                               NULL,
+                                               NULL,
+                                               gsub_glyphs );
+      }
+    }
+
+    if ( style_class->coverage == AF_COVERAGE_DEFAULT )
+    {
+      FT_UInt  i;
+
+
+      /* A script's lookups can also substitute glyphs of other scripts. */
+      /* Seed the closure with this style's glyphs so that their         */
+      /* substitutes inherit the same style.                             */
+      for ( i = 0; i < globals->glyph_count; i++ )
+        if ( ( gstyles[i] & AF_STYLE_MASK ) == style_class->style )
+          hb( set_add )( gsub_glyphs, i );
+
+      hb( ot_layout_lookups_substitute_closure )( face,
+                                                  gsub_lookups,
+                                                  gsub_glyphs );
     }
 
 #ifdef FT_DEBUG_LEVEL_TRACE
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c	2026-11-15 23:20:43.000000000 +0000
@@ -291,11 +291,10 @@
     /* It is called with either q2 or q3 positive, which is necessary    */
     /* for the peak to exist and avoids undefined FT_MSB.                */
 
-    shift = 27 - FT_MSB( (FT_UInt32)( FT_ABS( q1 ) |
-                                      FT_ABS( q2 ) |
-                                      FT_ABS( q3 ) |
-                                      FT_ABS( q4 ) ) );
-
+    shift = 8 * sizeof ( FT_Pos ) - 5 - FT_MSB( ULABS( q1 ) |
+                                                ULABS( q2 ) |
+                                                ULABS( q3 ) |
+                                                ULABS( q4 ) );
     if ( shift > 0 )
     {
       /* upscaling too much just wastes time */
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c	2026-11-15 23:20:43.000000000 +0000
@@ -776,18 +776,12 @@
     FT_Bitmap         source_bitmap;
     const FT_Bitmap*  source;
 
-    FT_Vector  source_offset;
-    FT_Vector  target_offset;
-
     FT_Bool  free_source_bitmap          = 0;
     FT_Bool  free_target_bitmap_on_error = 0;
 
-    FT_Pos  source_llx, source_lly, source_urx, source_ury;
-    FT_Pos  target_llx, target_lly, target_urx, target_ury;
-    FT_Pos  final_llx, final_lly, final_urx, final_ury;
+    FT_BBox  sbx, tbx, fbx;
 
     unsigned int  final_rows, final_width;
-    long          x, y;
 
 
     if ( !library || !target || !source_ || !atarget_offset )
@@ -811,110 +805,32 @@
     if ( !( source_->width && source_->rows ) )
       return FT_Err_Ok;               /* nothing to do */
 
-    /* assure integer pixel offsets */
-    source_offset.x = FT_PIX_FLOOR( source_offset_.x );
-    source_offset.y = FT_PIX_FLOOR( source_offset_.y );
-    target_offset.x = FT_PIX_FLOOR( atarget_offset->x );
-    target_offset.y = FT_PIX_FLOOR( atarget_offset->y );
-
-    /* get source bitmap dimensions */
-    source_llx = source_offset.x;
-    if ( FT_LONG_MIN + (FT_Pos)( source_->rows << 6 ) + 64 > source_offset.y )
-    {
-      FT_TRACE5((
-        "FT_Bitmap_Blend: y coordinate overflow in source bitmap\n" ));
-      return FT_THROW( Invalid_Argument );
-    }
-    source_lly = source_offset.y - ( source_->rows << 6 );
-
-    if ( FT_LONG_MAX - (FT_Pos)( source_->width << 6 ) - 64 < source_llx )
-    {
-      FT_TRACE5((
-        "FT_Bitmap_Blend: x coordinate overflow in source bitmap\n" ));
-      return FT_THROW( Invalid_Argument );
-    }
-    source_urx = source_llx + ( source_->width << 6 );
-    source_ury = source_offset.y;
-
-    /* get target bitmap dimensions */
-    if ( target->width && target->rows )
-    {
-      target_llx = target_offset.x;
-      if ( FT_LONG_MIN + (FT_Pos)( target->rows << 6 ) > target_offset.y )
-      {
-        FT_TRACE5((
-          "FT_Bitmap_Blend: y coordinate overflow in target bitmap\n" ));
-        return FT_THROW( Invalid_Argument );
-      }
-      target_lly = target_offset.y - ( target->rows << 6 );
+    /* get source bitmap dimensions assuming integer offsets */
+    sbx.xMin = ( source_offset_.x >> 6 );
+    sbx.yMin = ( source_offset_.y >> 6 ) - source_->rows;
+    sbx.xMax = ( source_offset_.x >> 6 ) + source_->width;
+    sbx.yMax = ( source_offset_.y >> 6 );
 
-      if ( FT_LONG_MAX - (FT_Pos)( target->width << 6 ) < target_llx )
-      {
-        FT_TRACE5((
-          "FT_Bitmap_Blend: x coordinate overflow in target bitmap\n" ));
-        return FT_THROW( Invalid_Argument );
-      }
-      target_urx = target_llx + ( target->width << 6 );
-      target_ury = target_offset.y;
-    }
-    else
-    {
-      target_llx = FT_LONG_MAX;
-      target_lly = FT_LONG_MAX;
-      target_urx = FT_LONG_MIN;
-      target_ury = FT_LONG_MIN;
-    }
-
-    /* compute final bitmap dimensions */
-    final_llx = FT_MIN( source_llx, target_llx );
-    final_lly = FT_MIN( source_lly, target_lly );
-    final_urx = FT_MAX( source_urx, target_urx );
-    final_ury = FT_MAX( source_ury, target_ury );
-
-    final_width = ( final_urx - final_llx ) >> 6;
-    final_rows  = ( final_ury - final_lly ) >> 6;
-
-#ifdef FT_DEBUG_LEVEL_TRACE
     FT_TRACE5(( "FT_Bitmap_Blend:\n" ));
     FT_TRACE5(( "  source bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
-      source_llx / 64, source_lly / 64,
-      source_urx / 64, source_ury / 64,
+      sbx.xMin, sbx.yMin, sbx.xMax, sbx.yMax,
       source_->width, source_->rows ));
 
-    if ( target->width && target->rows )
-      FT_TRACE5(( "  target bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
-        target_llx / 64, target_lly / 64,
-        target_urx / 64, target_ury / 64,
-        target->width, target->rows ));
-    else
-      FT_TRACE5(( "  target bitmap: empty\n" ));
-
-    if ( final_width && final_rows )
-      FT_TRACE5(( "  final bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
-        final_llx / 64, final_lly / 64,
-        final_urx / 64, final_ury / 64,
-        final_width, final_rows ));
-    else
-      FT_TRACE5(( "  final bitmap: empty\n" ));
-#endif /* FT_DEBUG_LEVEL_TRACE */
-
-    if ( !( final_width && final_rows ) )
-      return FT_Err_Ok;               /* nothing to do */
-
-    /* for blending, set offset vector of final bitmap */
-    /* temporarily to (0,0)                            */
-    source_llx -= final_llx;
-    source_lly -= final_lly;
-
-    if ( target->width && target->rows )
+    /* sanity check */
+    if ( sbx.xMin > sbx.xMax      || sbx.yMin > sbx.yMax     ||
+         source_->width > 0x7FFFU || source_->rows > 0x7FFFU )
     {
-      target_llx -= final_llx;
-      target_lly -= final_lly;
+      FT_TRACE5(( "FT_Bitmap_Blend: source dimension overflow\n" ));
+      return FT_THROW( Invalid_Argument );
     }
 
-    /* set up target bitmap */
-    if ( target->pixel_mode == FT_PIXEL_MODE_NONE )
+    if ( !target->width || !target->rows )
     {
+      FT_TRACE5(( "  target bitmap: empty\n" ));
+
+      final_width = source_->width;
+      final_rows  = source_->rows;
+
       /* create new empty bitmap */
       target->width      = final_width;
       target->rows       = final_rows;
@@ -926,72 +842,116 @@
         return error;
 
       free_target_bitmap_on_error = 1;
+
+      fbx = sbx;
     }
-    else if ( target->width != final_width ||
-              target->rows  != final_rows  )
+    else
     {
-      /* adjust old bitmap to enlarged size */
-      int  pitch, new_pitch;
+      /* get target bitmap dimensions assuming integer offsets */
+      tbx.xMin = ( atarget_offset->x >> 6 );
+      tbx.yMin = ( atarget_offset->y >> 6 ) - target->rows;
+      tbx.xMax = ( atarget_offset->x >> 6 ) + target->width;
+      tbx.yMax = ( atarget_offset->y >> 6 );
 
-      unsigned char*  buffer = NULL;
+      FT_TRACE5(( "  target bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
+        tbx.xMin, tbx.yMin, tbx.xMax, tbx.yMax,
+        target->width, target->rows ));
 
+      /* sanity check */
+      if ( tbx.xMin > tbx.xMax || tbx.yMin > tbx.yMax )
+      {
+        FT_TRACE5(( "FT_Bitmap_Blend: targget dimension overflow\n" ));
+        return FT_THROW( Invalid_Argument );
+      }
 
-      pitch = target->pitch;
+      /* compute final bitmap dimensions */
+      fbx.xMin = FT_MIN( sbx.xMin, tbx.xMin );
+      fbx.yMin = FT_MIN( sbx.yMin, tbx.yMin );
+      fbx.xMax = FT_MAX( sbx.xMax, tbx.xMax );
+      fbx.yMax = FT_MAX( sbx.yMax, tbx.yMax );
+
+      /* sanity check */
+      if ( fbx.xMin < -0x10000 || fbx.xMax >= 0x10000 ||
+           fbx.yMin < -0x10000 || fbx.yMax >= 0x10000 )
+      {
+        FT_TRACE5(( "FT_Bitmap_Blend: final dimension overflow\n" ));
+        return FT_THROW( Invalid_Argument );
+      }
 
-      if ( pitch < 0 )
-        pitch = -pitch;
+      final_width = fbx.xMax - fbx.xMin;
+      final_rows  = fbx.yMax - fbx.yMin;
 
-      new_pitch = (int)final_width * 4;
+      /* adjust target bitmap to enlarged size */
+      if ( target->width < final_width ||
+           target->rows  < final_rows  )
+      {
+        int  pitch, new_pitch;
 
-      /* TODO: provide an in-buffer solution for large bitmaps */
-      /*       to avoid allocation of a new buffer             */
-      if ( FT_ALLOC_MULT( buffer, final_rows, new_pitch ) )
-        goto Error;
+        unsigned char*  buffer = NULL;
 
-      /* copy data to new buffer */
-      x = target_llx >> 6;
-      y = target_lly >> 6;
-
-      /* the bitmap flow is from top to bottom, */
-      /* but y is measured from bottom to top   */
-      if ( target->pitch < 0 )
-      {
-        /* XXX */
-      }
-      else
-      {
-        unsigned char*  p =
-          target->buffer;
-        unsigned char*  q =
-          buffer +
-          ( final_rows - y - target->rows ) * new_pitch +
-          x * 4;
-        unsigned char*  limit_p =
-          p + pitch * (int)target->rows;
 
+        pitch = target->pitch;
+
+        if ( pitch < 0 )
+          pitch = -pitch;
+
+        new_pitch = (int)final_width * 4;
+
+        /* TODO: provide an in-buffer solution for large bitmaps */
+        /*       to avoid allocation of a new buffer             */
+        if ( FT_ALLOC_MULT( buffer, final_rows, new_pitch ) )
+          goto Error;
 
-        while ( p < limit_p )
+        /* copy data to new buffer */
+
+        /* the bitmap flow is from top to bottom, */
+        /* but y is measured from bottom to top   */
+        if ( target->pitch < 0 )
+        {
+          /* XXX */
+        }
+        else
         {
-          FT_MEM_COPY( q, p, pitch );
+          FT_Pos  x = tbx.xMin - fbx.xMin;
+          FT_Pos  y = tbx.yMin - fbx.yMin;
 
-          p += pitch;
-          q += new_pitch;
+          unsigned char*  p =
+            target->buffer;
+          unsigned char*  q =
+            buffer +
+            ( final_rows - y - target->rows ) * new_pitch +
+            x * 4;
+          unsigned char*  limit_p =
+            p + pitch * (int)target->rows;
+
+
+          while ( p < limit_p )
+          {
+            FT_MEM_COPY( q, p, pitch );
+
+            p += pitch;
+            q += new_pitch;
+          }
         }
-      }
 
-      FT_FREE( target->buffer );
+        FT_FREE( target->buffer );
 
-      target->width = final_width;
-      target->rows  = final_rows;
+        target->width = final_width;
+        target->rows  = final_rows;
 
-      if ( target->pitch < 0 )
-        target->pitch = -new_pitch;
-      else
-        target->pitch = new_pitch;
+        if ( target->pitch < 0 )
+          target->pitch = -new_pitch;
+        else
+          target->pitch = new_pitch;
 
-      target->buffer = buffer;
+        target->buffer = buffer;
+      }
     }
 
+    FT_TRACE5(( "  final bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
+      fbx.xMin, fbx.yMin, fbx.xMax, fbx.yMax,
+      final_width, final_rows ));
+
     /* adjust source bitmap if necessary */
     if ( source_->pixel_mode != FT_PIXEL_MODE_GRAY )
     {
@@ -1008,8 +968,6 @@
 
     /* do blending; the code below returns pre-multiplied channels, */
     /* similar to what FreeType gets from `CBDT' tables             */
-    x = source_llx >> 6;
-    y = source_lly >> 6;
 
     /* the bitmap flow is from top to bottom, */
     /* but y is measured from bottom to top   */
@@ -1019,6 +977,9 @@
     }
     else
     {
+      FT_Pos  x = sbx.xMin - fbx.xMin;
+      FT_Pos  y = sbx.yMin - fbx.yMin;
+
       unsigned char*  p =
         source->buffer;
       unsigned char*  q =
@@ -1064,8 +1025,8 @@
       }
     }
 
-    atarget_offset->x = final_llx;
-    atarget_offset->y = final_lly + ( final_rows << 6 );
+    atarget_offset->x = fbx.xMin * 64;
+    atarget_offset->y = fbx.yMax * 64;
 
   Error:
     if ( error && free_target_bitmap_on_error )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c	2026-11-15 23:20:43.000000000 +0000
@@ -714,9 +714,8 @@
   FT_Matrix_Check( const FT_Matrix*  matrix )
   {
     FT_Fixed  xx, xy, yx, yy;
-    FT_Fixed  val;
+    FT_ULong  val, abs_det, frob_sq;
     FT_Int    shift;
-    FT_ULong  temp1, temp2;
 
 
     if ( !matrix )
@@ -726,16 +725,14 @@
     xy  = matrix->xy;
     yx  = matrix->yx;
     yy  = matrix->yy;
-    val = FT_ABS( xx ) | FT_ABS( xy ) | FT_ABS( yx ) | FT_ABS( yy );
+    val = ULABS( xx ) | ULABS( xy ) | ULABS( yx ) | ULABS( yy );
 
     /* we only handle non-zero 32-bit values */
-    if ( !val || val > 0x7FFFFFFFL )
+    if ( !val || val > 0x7FFFFFFFUL )
       return 0;
 
-    /* Scale matrix to avoid the temp1 overflow, which is */
-    /* more stringent than avoiding the temp2 overflow.   */
-
-    shift = FT_MSB( val ) - 12;
+    /* Scale matrix to avoid overflows */
+    shift = FT_MSB( val ) - 4 * sizeof ( FT_ULong ) + 2;
 
     if ( shift > 0 )
     {
@@ -745,11 +742,11 @@
       yy >>= shift;
     }
 
-    temp1 = 32U * (FT_ULong)FT_ABS( xx * yy - xy * yx );
-    temp2 = (FT_ULong)( xx * xx ) + (FT_ULong)( xy * xy ) +
-            (FT_ULong)( yx * yx ) + (FT_ULong)( yy * yy );
+    abs_det = ULABS( xx * yy - xy * yx );
+    frob_sq = (FT_ULong)( xx * xx ) + (FT_ULong)( xy * xy ) +
+              (FT_ULong)( yx * yx ) + (FT_ULong)( yy * yy );
 
-    if ( temp1 <= temp2 )
+    if ( abs_det <= frob_sq / 32 )
       return 0;
 
     return 1;
@@ -966,7 +963,7 @@
     FT_Int    result;
 
 
-    if ( (FT_ULong)FT_ABS( in_x ) + (FT_ULong)FT_ABS( out_y ) <= 92681UL )
+    if ( ULABS( in_x ) + ULABS( out_y ) <= 92681UL )
     {
       z1.lo = (FT_UInt32)in_x * (FT_UInt32)out_y;
       z1.hi = (FT_UInt32)( (FT_Int32)z1.lo >> 31 );  /* sign-expansion */
@@ -974,7 +971,7 @@
     else
       ft_multo64( (FT_UInt32)in_x, (FT_UInt32)out_y, &z1 );
 
-    if ( (FT_ULong)FT_ABS( in_y ) + (FT_ULong)FT_ABS( out_x ) <= 92681UL )
+    if ( ULABS( in_y ) + ULABS( out_x ) <= 92681UL )
     {
       z2.lo = (FT_UInt32)in_y * (FT_UInt32)out_x;
       z2.hi = (FT_UInt32)( (FT_Int32)z2.lo >> 31 );  /* sign-expansion */
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c	2026-11-15 23:20:43.000000000 +0000
@@ -42,6 +42,10 @@
 #include 
 #include 
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include 
+#endif
+
 #include 
 
 #ifdef FT_CONFIG_OPTION_MAC_FONTS
@@ -503,8 +507,8 @@
                    pbox.xMin < -0x1000000 || pbox.xMax >= 0x1000000 ||
                    pbox.yMin < -0x1000000 || pbox.yMax >= 0x1000000 ||
              ( slot->face                                         &&
-               ( width  > 10 * slot->face->size->metrics.x_ppem ||
-                 height > 10 * slot->face->size->metrics.y_ppem ) ) );
+               ( width  > 16 * slot->face->size->metrics.x_ppem ||
+                 height > 16 * slot->face->size->metrics.y_ppem ) ) );
 
     if ( ret )
       FT_TRACE3(( "ft_glyphslot_preset_bitmap: [%ld %ld %ld %ld]\n",
@@ -788,7 +792,7 @@
 
     internal->transform_flags = 0;
 
-    if ( !matrix )
+    if ( !matrix || !FT_Matrix_Check( matrix ) )
     {
       internal->transform_matrix.xx = 0x10000L;
       internal->transform_matrix.xy = 0;
@@ -1017,6 +1021,22 @@
       }
     }
 
+#ifdef TT_CONFIG_OPTION_VARC
+    /* Never auto-hint a VARC (variable composite) glyph: its components */
+    /* are already loaded unhinted, and the auto-fitter cannot process   */
+    /* the assembled composite (it also re-enters variation-coordinate   */
+    /* setting).  Use the native hinter / unhinted load instead.         */
+    if ( autohint && FT_IS_SFNT( face ) )
+    {
+      FT_Service_VARC  varc;
+
+
+      FT_FACE_FIND_SERVICE( face, varc, VARC );
+      if ( varc && varc->has_glyph( face, glyph_index ) )
+        autohint = FALSE;
+    }
+#endif
+
     if ( autohint )
     {
       FT_AutoHinter_Interface  hinting;
@@ -1441,8 +1461,14 @@
     {
       if ( cur[0]->encoding == FT_ENCODING_UNICODE )
       {
-        face->charmap = cur[0];
-        return FT_Err_Ok;
+        FT_Long  format = FT_Get_CMap_Format( cur[0] );
+
+
+        if ( format != 14 && format != 15 )
+        {
+          face->charmap = cur[0];
+          return FT_Err_Ok;
+        }
       }
     }
 
@@ -1457,7 +1483,7 @@
    *
    * @Description:
    *   This function finds the variant selector charmap, if there is one.
-   *   There can only be one (platform=0, specific=5, format=14).
+   *   There can only be one (platform=0, specific=5, format=14 or 15).
    */
   static FT_CharMap
   find_variant_selector_charmap( FT_Face  face )
@@ -1480,9 +1506,14 @@
     for ( cur = first; cur < end; cur++ )
     {
       if ( cur[0]->platform_id == TT_PLATFORM_APPLE_UNICODE    &&
-           cur[0]->encoding_id == TT_APPLE_ID_VARIANT_SELECTOR &&
-           FT_Get_CMap_Format( cur[0] ) == 14                  )
-        return cur[0];
+           cur[0]->encoding_id == TT_APPLE_ID_VARIANT_SELECTOR )
+      {
+        FT_Long  format = FT_Get_CMap_Format( cur[0] );
+
+
+        if ( format == 14 || format == 15 )
+          return cur[0];
+      }
     }
 
     return NULL;
@@ -3771,11 +3802,16 @@
 
     for ( ; cur < limit; cur++ )
     {
-      if ( cur[0] == charmap                    &&
-           FT_Get_CMap_Format ( charmap ) != 14 )
+      if ( cur[0] == charmap )
       {
-        face->charmap = cur[0];
-        return FT_Err_Ok;
+        FT_Long  format = FT_Get_CMap_Format( charmap );
+
+
+        if ( format != 14 && format != 15 )
+        {
+          face->charmap = cur[0];
+          return FT_Err_Ok;
+        }
       }
     }
 
@@ -4737,121 +4773,114 @@
     FT_Error     error = FT_Err_Ok;
     FT_Face      face  = slot->face;
     FT_Renderer  renderer;
+    FT_ListNode  node  = NULL;
 
 
-    switch ( slot->format )
+    /* try to render colored glyph layers as a special case */
+    if ( slot->internal->load_flags & FT_LOAD_COLOR &&
+         slot->format == FT_GLYPH_FORMAT_OUTLINE    )
     {
-    default:
-      if ( slot->internal->load_flags & FT_LOAD_COLOR )
-      {
-        FT_LayerIterator  iterator;
+      FT_LayerIterator  iterator;
 
-        FT_UInt  base_glyph = slot->glyph_index;
+      FT_UInt  base_glyph = slot->glyph_index;
 
-        FT_Bool  have_layers;
-        FT_UInt  glyph_index;
-        FT_UInt  color_index;
+      FT_Bool  have_layers;
+      FT_UInt  glyph_index;
+      FT_UInt  color_index;
 
 
-        /* check whether we have colored glyph layers */
-        iterator.p  = NULL;
-        have_layers = FT_Get_Color_Glyph_Layer( face,
-                                                base_glyph,
-                                                &glyph_index,
-                                                &color_index,
-                                                &iterator );
-        if ( have_layers )
+      iterator.p  = NULL;
+      have_layers = FT_Get_Color_Glyph_Layer( face,
+                                              base_glyph,
+                                              &glyph_index,
+                                              &color_index,
+                                              &iterator );
+      if ( have_layers )
+      {
+        error = FT_New_GlyphSlot( face, NULL );
+        if ( !error )
         {
-          error = FT_New_GlyphSlot( face, NULL );
-          if ( !error )
+          TT_Face       ttface = (TT_Face)face;
+          SFNT_Service  sfnt   = (SFNT_Service)ttface->sfnt;
+
+
+          do
           {
-            TT_Face       ttface = (TT_Face)face;
-            SFNT_Service  sfnt   = (SFNT_Service)ttface->sfnt;
+            FT_Int32  load_flags = slot->internal->load_flags;
 
 
-            do
-            {
-              FT_Int32  load_flags = slot->internal->load_flags;
+            /* disable the `FT_LOAD_COLOR' flag to avoid recursion */
+            /* right here in this function                         */
+            load_flags &= ~FT_LOAD_COLOR;
 
+            /* render into the new `face->glyph' glyph slot */
+            load_flags |= FT_LOAD_RENDER | FT_LOAD_NO_BITMAP;
 
-              /* disable the `FT_LOAD_COLOR' flag to avoid recursion */
-              /* right here in this function                         */
-              load_flags &= ~FT_LOAD_COLOR;
-
-              /* render into the new `face->glyph' glyph slot */
-              load_flags |= FT_LOAD_RENDER;
-
-              error = FT_Load_Glyph( face, glyph_index, load_flags );
-              if ( error )
-                break;
-
-              /* blend new `face->glyph' into old `slot'; */
-              /* at the first call, `slot' is still empty */
-              error = sfnt->colr_blend( ttface,
-                                        color_index,
-                                        slot,
-                                        face->glyph );
-              if ( error )
-                break;
-
-            } while ( FT_Get_Color_Glyph_Layer( face,
-                                                base_glyph,
-                                                &glyph_index,
-                                                &color_index,
-                                                &iterator ) );
+            error = FT_Load_Glyph( face, glyph_index, load_flags );
+            if ( error )
+              break;
 
-            if ( !error )
-              slot->format = FT_GLYPH_FORMAT_BITMAP;
+            /* blend new `face->glyph' into old `slot'; */
+            /* at the first call, `slot' is still empty */
+            error = sfnt->colr_blend( ttface,
+                                      color_index,
+                                      slot,
+                                      face->glyph );
+            if ( error )
+              break;
 
-            /* this call also restores `slot' as the glyph slot */
-            FT_Done_GlyphSlot( face->glyph );
-          }
+          } while ( FT_Get_Color_Glyph_Layer( face,
+                                              base_glyph,
+                                              &glyph_index,
+                                              &color_index,
+                                              &iterator ) );
 
           if ( !error )
-            return error;
+            slot->format = FT_GLYPH_FORMAT_BITMAP;
 
-          /* Failed to do the colored layer.  Draw outline instead. */
-          slot->format = FT_GLYPH_FORMAT_OUTLINE;
+          /* this call also restores `slot' as the glyph slot */
+          FT_Done_GlyphSlot( face->glyph );
         }
-      }
 
-      {
-        FT_ListNode  node = NULL;
+        if ( !error )
+          return error;
 
+        /* Failed to do the colored layer.  Draw outline instead. */
+        slot->format = FT_GLYPH_FORMAT_OUTLINE;
+      }
+    }
 
-        /* small shortcut for the very common case */
-        if ( slot->format == FT_GLYPH_FORMAT_OUTLINE )
-        {
-          renderer = library->cur_renderer;
-          node     = library->renderers.head;
-        }
-        else
-          renderer = FT_Lookup_Renderer( library, slot->format, &node );
+    /* small shortcut for the very common case */
+    if ( slot->format == FT_GLYPH_FORMAT_OUTLINE )
+    {
+      renderer = library->cur_renderer;
+      node     = library->renderers.head;
+    }
+    else
+      renderer = FT_Lookup_Renderer( library, slot->format, &node );
 
-        error = FT_ERR( Cannot_Render_Glyph );
-        while ( renderer )
-        {
-          error = renderer->render( renderer, slot, render_mode, NULL );
-          if ( !error                                   ||
-               FT_ERR_NEQ( error, Cannot_Render_Glyph ) )
-            break;
-
-          /* FT_Err_Cannot_Render_Glyph is returned if the render mode   */
-          /* is unsupported by the current renderer for this glyph image */
-          /* format.                                                     */
-
-          /* now, look for another renderer that supports the same */
-          /* format.                                               */
-          renderer = FT_Lookup_Renderer( library, slot->format, &node );
-        }
+    error = FT_ERR( Cannot_Render_Glyph );
+    while ( renderer )
+    {
+      error = renderer->render( renderer, slot, render_mode, NULL );
+      if ( !error                                   ||
+           FT_ERR_NEQ( error, Cannot_Render_Glyph ) )
+        break;
 
-        /* it is not an error if we cannot render a bitmap glyph */
-        if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
-             slot->format == FT_GLYPH_FORMAT_BITMAP  )
-          error = FT_Err_Ok;
-      }
+      /* `FT_Err_Cannot_Render_Glyph` is returned if the render mode */
+      /* is unsupported by the current renderer for this glyph image */
+      /* format.                                                     */
+
+      /* now, look for another renderer that supports the same */
+      /* format.                                               */
+      renderer = FT_Lookup_Renderer( library, slot->format, &node );
     }
 
+    /* it is not an error if we cannot render a bitmap glyph */
+    if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
+         slot->format == FT_GLYPH_FORMAT_BITMAP  )
+      error = FT_Err_Ok;
+
 #ifdef FT_DEBUG_LEVEL_TRACE
 
 #undef  FT_COMPONENT
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c	2026-11-15 23:20:43.000000000 +0000
@@ -102,15 +102,14 @@
       tags  = outline->tags   + first;
       tag   = FT_CURVE_TAG( tags[0] );
 
-      /* A contour cannot start with a cubic control point! */
-      if ( tag == FT_CURVE_TAG_CUBIC )
-        goto Invalid_Outline;
-
       /* check first point to determine origin */
-      if ( tag == FT_CURVE_TAG_CONIC )
+      if ( tag != FT_CURVE_TAG_ON )
       {
-        /* first point is conic control.  Yes, this happens. */
-        if ( FT_CURVE_TAG( outline->tags[last] ) == FT_CURVE_TAG_ON )
+        FT_Int  last_tag = FT_CURVE_TAG( outline->tags[last] );
+
+
+        /* first point is a control point.  Yes, this happens. */
+        if ( last_tag == FT_CURVE_TAG_ON )
         {
           /* start at last point if it is on the curve */
           v_start = v_last;
@@ -118,13 +117,16 @@
         }
         else
         {
-          /* if both first and last points are conic,         */
-          /* start at their middle and record its position    */
-          /* for closure                                      */
+          if ( last_tag != tag )
+            goto Invalid_Outline;
+
+          /* if both first and last points are controls,   */
+          /* start at their middle and record its position */
+          /* for closure                                   */
           v_start.x = ( v_start.x + v_last.x ) / 2;
           v_start.y = ( v_start.y + v_last.y ) / 2;
 
-       /* v_last = v_start; */
+          /* v_last = v_start; */
         }
         point--;
         tags--;
@@ -242,11 +244,24 @@
             if ( point <= limit )
             {
               FT_Vector  vec;
+              FT_Vector  v_middle;
+
 
+              tag = FT_CURVE_TAG( tags[0] );
 
               vec.x = SCALED( point->x );
               vec.y = SCALED( point->y );
 
+              if ( tag == FT_CURVE_TAG_CUBIC )
+              {
+                v_middle.x = ( vec2.x + vec.x ) / 2;
+                v_middle.y = ( vec2.y + vec.y ) / 2;
+
+                vec = v_middle;
+              }
+              else if ( tag != FT_CURVE_TAG_ON )
+                goto Invalid_Outline;
+
               FT_TRACE5(( "  cubic to (%.2f, %.2f)"
                           " with controls (%.2f, %.2f) and (%.2f, %.2f)\n",
                           (double)vec.x / 64,
@@ -258,6 +273,12 @@
               error = func_interface->cubic_to( &vec1, &vec2, &vec, user );
               if ( error )
                 goto Exit;
+
+              if ( tag == FT_CURVE_TAG_CUBIC )
+              {
+                point--;
+                tags--;
+              }
               continue;
             }
 
@@ -554,11 +575,15 @@
     last = -1;
     for ( n = 0; n < outline->n_contours; n++ )
     {
-      /* keep the first contour point as is and swap points around it */
-      /* to guarantee that the cubic arches stay valid after reverse  */
-      first = last + 2;
+      first = last + 1;
       last  = outline->contours[n];
 
+      /* Keep the first point unless it is a cubic control.  In that */
+      /* case, reverse the entire contour to preserve control pairs, */
+      /* including contours with no explicit on-curve points.        */
+      if ( FT_CURVE_TAG( outline->tags[first] ) != FT_CURVE_TAG_CUBIC )
+        first++;
+
       /* reverse point table */
       {
         FT_Vector*  p = outline->points + first;
@@ -1050,12 +1075,17 @@
   FT_EXPORT_DEF( FT_Orientation )
   FT_Outline_Get_Orientation( FT_Outline*  outline )
   {
+    FT_Vector*  points;
+    FT_Int      c, n, first, last;
+
+#ifdef FT_INT64
+    FT_Int64    area = 0;
+#else
     FT_BBox     cbox = { 0, 0, 0, 0 };
     FT_Int      xshift, yshift;
-    FT_Vector*  points;
     FT_Vector   v_prev, v_cur;
-    FT_Int      c, n, first, last;
     FT_Pos      area = 0;
+#endif
 
 
     if ( !outline || outline->n_points <= 0 )
@@ -1066,6 +1096,42 @@
     /* cubic or quadratic curves, this test deals with the polygon    */
     /* only that is spanned up by the control points.                 */
 
+    points = outline->points;
+
+#ifdef FT_INT64
+
+    /* Single-pass shoelace.  The 64-bit accumulator removes the need   */
+    /* for the coordinate shift pre-pass (and its `FT_Outline_Get_CBox` */
+    /* traversal) that the 32-bit variant below uses.                   */
+    last = -1;
+    for ( c = 0; c < outline->n_contours; c++ )
+    {
+      FT_Pos  prev_x, prev_y;
+
+
+      first = last + 1;
+      last  = outline->contours[c];
+
+      prev_x = points[last].x;
+      prev_y = points[last].y;
+
+      for ( n = first; n <= last; n++ )
+      {
+        FT_Pos  cur_x = points[n].x;
+        FT_Pos  cur_y = points[n].y;
+
+
+        area = ADD_INT64( area,
+                          MUL_INT64( SUB_INT64( cur_y, prev_y ),
+                                     ADD_INT64( cur_x, prev_x ) ) );
+
+        prev_x = cur_x;
+        prev_y = cur_y;
+      }
+    }
+
+#else /* !FT_INT64 */
+
     FT_Outline_Get_CBox( outline, &cbox );
 
     /* Handle collapsed outlines to avoid undefined FT_MSB. */
@@ -1084,8 +1150,6 @@
     yshift = FT_MSB( (FT_UInt32)( cbox.yMax - cbox.yMin ) ) - 14;
     yshift = FT_MAX( yshift, 0 );
 
-    points = outline->points;
-
     last = -1;
     for ( c = 0; c < outline->n_contours; c++ )
     {
@@ -1108,6 +1172,8 @@
       }
     }
 
+#endif /* FT_INT64 */
+
     if ( area > 0 )
       return FT_ORIENTATION_POSTSCRIPT;
     else if ( area < 0 )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c	2026-11-15 23:20:43.000000000 +0000
@@ -656,12 +656,11 @@
     FT_UInt   num_contours = 0;
 
     FT_UInt     count      = border->num_points;
-    FT_Vector*  point      = border->points;
     FT_Byte*    tags       = border->tags;
     FT_Int      in_contour = 0;
 
 
-    for ( ; count > 0; count--, num_points++, point++, tags++ )
+    for ( ; count > 0; count--, num_points++, tags++ )
     {
       if ( tags[0] & FT_STROKE_TAG_BEGIN )
       {
@@ -1875,6 +1874,10 @@
       goto Exit;
     }
 
+    /* don't try to end the path if no segments have been generated */
+    if ( stroker->first_point )
+      goto Exit;
+
     if ( stroker->subpath_open )
     {
       FT_StrokeBorder  right = stroker->borders;
@@ -2095,15 +2098,14 @@
       tags  = outline->tags   + first;
       tag   = FT_CURVE_TAG( tags[0] );
 
-      /* A contour cannot start with a cubic control point! */
-      if ( tag == FT_CURVE_TAG_CUBIC )
-        goto Invalid_Outline;
-
       /* check first point to determine origin */
-      if ( tag == FT_CURVE_TAG_CONIC )
+      if ( tag != FT_CURVE_TAG_ON )
       {
-        /* First point is conic control.  Yes, this happens. */
-        if ( FT_CURVE_TAG( outline->tags[last] ) == FT_CURVE_TAG_ON )
+        FT_Int  last_tag = FT_CURVE_TAG( outline->tags[last] );
+
+
+        /* First point is a control point.  Yes, this happens. */
+        if ( last_tag == FT_CURVE_TAG_ON )
         {
           /* start at last point if it is on the curve */
           v_start = v_last;
@@ -2111,8 +2113,11 @@
         }
         else
         {
-          /* if both first and last points are conic, */
-          /* start at their middle                    */
+          if ( last_tag != tag )
+            goto Invalid_Outline;
+
+          /* if both first and last points are controls, */
+          /* start at their middle                       */
           v_start.x = ( v_start.x + v_last.x ) / 2;
           v_start.y = ( v_start.y + v_last.y ) / 2;
         }
@@ -2206,13 +2211,31 @@
             if ( point <= limit )
             {
               FT_Vector  vec;
+              FT_Vector  v_middle;
 
 
+              tag = FT_CURVE_TAG( tags[0] );
               vec = point[0];
 
+              if ( tag == FT_CURVE_TAG_CUBIC )
+              {
+                v_middle.x = ( vec2.x + vec.x ) / 2;
+                v_middle.y = ( vec2.y + vec.y ) / 2;
+
+                vec = v_middle;
+              }
+              else if ( tag != FT_CURVE_TAG_ON )
+                goto Invalid_Outline;
+
               error = FT_Stroker_CubicTo( stroker, &vec1, &vec2, &vec );
               if ( error )
                 goto Exit;
+
+              if ( tag == FT_CURVE_TAG_CUBIC )
+              {
+                point--;
+                tags--;
+              }
               continue;
             }
 
@@ -2226,13 +2249,9 @@
       if ( error )
         goto Exit;
 
-      /* don't try to end the path if no segments have been generated */
-      if ( !stroker->first_point )
-      {
-        error = FT_Stroker_EndSubPath( stroker );
-        if ( error )
-          goto Exit;
-      }
+      error = FT_Stroker_EndSubPath( stroker );
+      if ( error )
+        goto Exit;
     }
 
     return FT_Err_Ok;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c	2026-11-15 23:20:43.000000000 +0000
@@ -40,6 +40,10 @@
 #include 
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include 
+#endif
+
 #include "cfferrs.h"
 
 #include 
@@ -1085,6 +1089,111 @@
 #endif
 
 
+#ifdef TT_CONFIG_OPTION_VARC
+
+  /*
+   * VARC SERVICE
+   *
+   * The implementation belongs to the `truetype' module.  The CFF
+   * driver only forwards calls for OpenType/CFF faces, in the same way
+   * that it forwards variation-font operations.
+   */
+
+  FT_CALLBACK_DEF( FT_Error )
+  cff_varc_init_axes( FT_Face  face,
+                      FT_UInt  axis_count )
+  {
+    CFF_Face         cffface = (CFF_Face)face;
+    FT_Service_VARC  varc    = (FT_Service_VARC)cffface->tt_varc;
+
+
+    return varc && varc->init_axes
+             ? varc->init_axes( face, axis_count )
+             : FT_THROW( Missing_Module );
+  }
+
+
+  FT_CALLBACK_DEF( FT_Error )
+  cff_varc_load( FT_Face    face,
+                 FT_Stream  stream )
+  {
+    CFF_Face         cffface = (CFF_Face)face;
+    FT_Service_VARC  varc    = (FT_Service_VARC)cffface->tt_varc;
+
+
+    return varc ? varc->load( face, stream )
+                : FT_THROW( Missing_Module );
+  }
+
+
+  FT_CALLBACK_DEF( void )
+  cff_varc_done( FT_Face  face )
+  {
+    CFF_Face         cffface = (CFF_Face)face;
+    FT_Service_VARC  varc    = (FT_Service_VARC)cffface->tt_varc;
+
+
+    if ( varc )
+      varc->done( face );
+  }
+
+
+  FT_CALLBACK_DEF( FT_Bool )
+  cff_varc_has_glyph( FT_Face  face,
+                      FT_UInt  glyph_index )
+  {
+    CFF_Face         cffface = (CFF_Face)face;
+    FT_Service_VARC  varc    = (FT_Service_VARC)cffface->tt_varc;
+
+
+    return FT_BOOL( varc && varc->has_glyph( face, glyph_index ) );
+  }
+
+
+  FT_CALLBACK_DEF( FT_Error )
+  cff_varc_load_glyph( FT_Face       face,
+                       FT_GlyphSlot  glyph_slot,
+                       FT_UInt       glyph_index,
+                       FT_Int32      load_flags )
+  {
+    CFF_Face         cffface = (CFF_Face)face;
+    FT_Service_VARC  varc    = (FT_Service_VARC)cffface->tt_varc;
+    CFF_Font         cff     = (CFF_Font)cffface->extra.data;
+
+    FT_Error  error;
+
+
+    if ( !varc )
+      return FT_THROW( Missing_Module );
+
+    if ( !FT_HAS_MULTIPLE_MASTERS( face ) &&
+         cff                              &&
+         cff->cff2                        &&
+         cff->vstore.axisCount            )
+    {
+      error = varc->init_axes( face, cff->vstore.axisCount );
+      if ( error )
+        return error;
+    }
+
+    return varc->load_glyph( face, glyph_slot,
+                             glyph_index, load_flags );
+  }
+
+
+  FT_DEFINE_SERVICE_VARCREC(
+    cff_service_varc,
+
+    cff_varc_init_axes,
+    cff_varc_load,
+    cff_varc_done,
+    cff_varc_has_glyph,
+    cff_varc_load_glyph
+  )
+
+#endif /* TT_CONFIG_OPTION_VARC */
+
+
   /*
    * CFFLOAD SERVICE
    *
@@ -1113,7 +1222,24 @@
   /*************************************************************************/
   /*************************************************************************/
 
-#if defined TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#if defined( TT_CONFIG_OPTION_GX_VAR_SUPPORT ) && \
+    defined( TT_CONFIG_OPTION_VARC )
+  FT_DEFINE_SERVICEDESCREC11(
+    cff_services,
+
+    FT_SERVICE_ID_FONT_FORMAT,          FT_FONT_FORMAT_CFF,
+    FT_SERVICE_ID_MULTI_MASTERS,        &cff_service_multi_masters,
+    FT_SERVICE_ID_METRICS_VARIATIONS,   &cff_service_metrics_variations,
+    FT_SERVICE_ID_VARC,                 &cff_service_varc,
+    FT_SERVICE_ID_POSTSCRIPT_INFO,      &cff_service_ps_info,
+    FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &cff_service_ps_name,
+    FT_SERVICE_ID_GLYPH_DICT,           &cff_service_glyph_dict,
+    FT_SERVICE_ID_TT_CMAP,              &cff_service_get_cmap_info,
+    FT_SERVICE_ID_CID,                  &cff_service_cid_info,
+    FT_SERVICE_ID_PROPERTIES,           &cff_service_properties,
+    FT_SERVICE_ID_CFF_LOAD,             &cff_service_cff_load
+  )
+#elif defined( TT_CONFIG_OPTION_GX_VAR_SUPPORT )
   FT_DEFINE_SERVICEDESCREC10(
     cff_services,
 
@@ -1123,6 +1249,20 @@
     FT_SERVICE_ID_POSTSCRIPT_INFO,      &cff_service_ps_info,
     FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &cff_service_ps_name,
     FT_SERVICE_ID_GLYPH_DICT,           &cff_service_glyph_dict,
+    FT_SERVICE_ID_TT_CMAP,              &cff_service_get_cmap_info,
+    FT_SERVICE_ID_CID,                  &cff_service_cid_info,
+    FT_SERVICE_ID_PROPERTIES,           &cff_service_properties,
+    FT_SERVICE_ID_CFF_LOAD,             &cff_service_cff_load
+  )
+#elif defined( TT_CONFIG_OPTION_VARC )
+  FT_DEFINE_SERVICEDESCREC9(
+    cff_services,
+
+    FT_SERVICE_ID_FONT_FORMAT,          FT_FONT_FORMAT_CFF,
+    FT_SERVICE_ID_VARC,                 &cff_service_varc,
+    FT_SERVICE_ID_POSTSCRIPT_INFO,      &cff_service_ps_info,
+    FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &cff_service_ps_name,
+    FT_SERVICE_ID_GLYPH_DICT,           &cff_service_glyph_dict,
     FT_SERVICE_ID_TT_CMAP,              &cff_service_get_cmap_info,
     FT_SERVICE_ID_CID,                  &cff_service_cid_info,
     FT_SERVICE_ID_PROPERTIES,           &cff_service_properties,
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c	2026-11-15 23:20:43.000000000 +0000
@@ -24,6 +24,10 @@
 #include 
 #include 
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include 
+#endif
+
 #include "cffload.h"
 #include "cffgload.h"
 
@@ -235,7 +239,7 @@
           return FT_THROW( Invalid_Argument );
       }
     }
-    else if ( glyph_index >= cff->num_glyphs )
+    else if ( glyph_index >= (FT_ULong)face->root.num_glyphs )
       return FT_THROW( Invalid_Argument );
 
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
@@ -408,6 +412,76 @@
 
 #endif /* FT_CONFIG_OPTION_SVG */
 
+#ifdef TT_CONFIG_OPTION_VARC
+
+    /* check for VARC glyphs */
+    {
+      FT_Service_VARC  varc = (FT_Service_VARC)face->face_varc;
+
+
+      if ( face->varc                                    &&
+           varc                                          &&
+           varc->has_glyph( (FT_Face)face, glyph_index ) )
+      {
+        FT_TRACE3(( "Loading VARC glyph\n" ));
+
+        error = varc->load_glyph( (FT_Face)face,
+                                  (FT_GlyphSlot)glyph,
+                                  glyph_index,
+                                  load_flags );
+        if ( !error )
+        {
+          SFNT_Service  sfnt = (SFNT_Service)face->sfnt;
+
+          FT_Short   sb;
+          FT_UShort  advanceX = 0;
+          FT_UShort  advanceY = 0;
+          FT_BBox    bbox;
+
+
+          FT_TRACE3(( "Successfully loaded VARC glyph\n" ));
+
+          /* The outline comes from the VARC table, so the advance and  */
+          /* metrics must be supplied here (`get_metrics` applies       */
+          /* HVAR/VVAR).                                                */
+          sfnt->get_metrics( face, FALSE, glyph_index, &sb, &advanceX );
+          sfnt->get_metrics( face, TRUE,  glyph_index, &sb, &advanceY );
+
+          glyph->root.linearHoriAdvance = advanceX;
+          glyph->root.linearVertAdvance = advanceY;
+
+          FT_Outline_Get_CBox( &glyph->root.outline, &bbox );
+          glyph->root.metrics.horiBearingX = bbox.xMin;
+          glyph->root.metrics.horiBearingY = bbox.yMax;
+          glyph->root.metrics.width        = SUB_LONG( bbox.xMax, bbox.xMin );
+          glyph->root.metrics.height       = SUB_LONG( bbox.yMax, bbox.yMin );
+
+          if ( ( load_flags & FT_LOAD_NO_SCALE ) || !size )
+          {
+            glyph->root.metrics.horiAdvance = advanceX;
+            glyph->root.metrics.vertAdvance = advanceY;
+          }
+          else
+          {
+            glyph->root.metrics.horiAdvance =
+              FT_MulFix( advanceX, size->root.metrics.x_scale );
+            glyph->root.metrics.vertAdvance =
+              FT_MulFix( advanceY, size->root.metrics.y_scale );
+          }
+
+          return FT_Err_Ok;
+        }
+
+        FT_TRACE3(( "Failed to load VARC glyph, falling back to CFF\n" ));
+      }
+    }
+
+#endif /* TT_CONFIG_OPTION_VARC */
+
+    /* A VARC-only glyph has no CFF2 fallback CharString. */
+    if ( glyph_index >= cff->num_glyphs )
+      return FT_THROW( Invalid_Argument );
+
     /* top-level code ensures that FT_LOAD_NO_HINTING is set */
     /* if FT_LOAD_NO_SCALE is active                         */
     hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_HINTING ) == 0 );
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffload.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffload.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffload.c	2026-11-15 23:20:43.000000000 +0000
@@ -634,6 +634,12 @@
     if ( error )
       goto Exit;
 
+    if ( !bytes )
+    {
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+
     if ( !FT_QALLOC( name, byte_len + 1 ) )
     {
       FT_MEM_COPY( name, bytes, byte_len );
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c	2026-11-15 23:20:43.000000000 +0000
@@ -624,7 +624,13 @@
       /* Note that this is only necessary for pure CFF and CEF fonts; */
       /* SFNT based fonts use the `name' table instead.               */
 
-      cffface->num_glyphs = (FT_Long)cff->num_glyphs;
+      /* VARC can define glyphs beyond the CFF2 CharStrings INDEX. */
+#ifdef TT_CONFIG_OPTION_VARC
+      if ( !cff2                                         ||
+           !face->varc                                   ||
+           cff->num_glyphs > face->max_profile.numGlyphs )
+#endif
+        cffface->num_glyphs = (FT_Long)cff->num_glyphs;
 
       dict = &cff->top_font.font_dict;
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cid/cidload.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cid/cidload.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/cid/cidload.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/cid/cidload.c	2026-11-15 23:20:43.000000000 +0000
@@ -512,12 +512,14 @@
     CID_FaceInfo   cid    = &face->cid;
     FT_Memory      memory = face->root.memory;
     FT_Stream      stream = face->cid_stream;
+    PSAux_Service  psaux  = (PSAux_Service)face->psaux;
     FT_Error       error;
+
     FT_UInt        n;
     CID_Subrs      subr;
     FT_UInt        max_offsets = 0;
-    FT_ULong*      offsets = NULL;
-    PSAux_Service  psaux = (PSAux_Service)face->psaux;
+    FT_ULong*      offsets     = NULL;
+    FT_ULong       cum_len     = 0;
 
 
     if ( FT_NEW_ARRAY( face->subrs, cid->num_dicts ) )
@@ -584,6 +586,14 @@
       /* now, compute the size of subrs charstrings, */
       /* allocate, and read them                     */
       data_len = offsets[num_subrs] - offsets[0];
+      cum_len += data_len;
+
+      if ( cum_len / 4 > stream->size )
+      {
+        FT_ERROR(( "cid_read_subrs: excessive overlaps\n" ));
+        error = FT_THROW( Invalid_File_Format );
+        goto Fail;
+      }
 
       if ( FT_QNEW_ARRAY( subr->code, num_subrs + 1 ) ||
            FT_QALLOC( subr->code[0], data_len )       )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c	2026-11-15 23:20:43.000000000 +0000
@@ -415,7 +415,7 @@
   /* Blend numOperands on the stack,                */
   /* store results into the first numBlends values, */
   /* then pop remaining arguments.                  */
-  static void
+  static FT_Error
   cf2_doBlend( const CFF_Blend  blend,
                CF2_Stack        opStack,
                CF2_UInt         numBlends )
@@ -423,10 +423,19 @@
     CF2_UInt  delta;
     CF2_UInt  base;
     CF2_UInt  i, j;
-    CF2_UInt  numOperands = (CF2_UInt)( numBlends * blend->lenBV );
+    CF2_UInt  numOperands;
+    CF2_UInt  count = cf2_stack_count( opStack );
 
 
-    base  = cf2_stack_count( opStack ) - numOperands;
+    if ( blend->lenBV == 0                ||
+         numBlends > count / blend->lenBV )
+      return FT_THROW( Stack_Underflow );
+
+    numOperands = numBlends * blend->lenBV;  /* cannot overflow here */
+    if ( numOperands > count )
+      return FT_THROW( Stack_Underflow );
+
+    base  = count - numOperands;
     delta = base + numBlends;
 
     FT_TRACE6(( " (" ));
@@ -455,6 +464,8 @@
 
     /* leave only `numBlends' results on stack */
     cf2_stack_pop( opStack, numOperands - numBlends );
+
+    return FT_Err_Ok;
   }
 
 
@@ -769,13 +780,10 @@
 
           /* do the blend */
           numBlends = (FT_UInt)cf2_stack_popInt( opStack );
-          if ( numBlends > stackSize )
-          {
-            lastError = FT_THROW( Invalid_Glyph_Format );
-            goto exit;
-          }
 
-          cf2_doBlend( &font->blend, opStack, numBlends );
+          lastError = cf2_doBlend( &font->blend, opStack, numBlends );
+          if ( lastError )
+            goto exit;
 
           font->blend.usedBV = TRUE;
         }
@@ -985,8 +993,8 @@
           FT_TRACE4(( "%s", op1 == cf2_cmdCALLGSUBR ? " callgsubr"
                                                     : " callsubr" ));
 
-          if ( ( !font->isT1 && charstringIndex > CF2_MAX_SUBR )       ||
-               (  font->isT1 && charstringIndex > T1_MAX_SUBRS_CALLS ) )
+          if ( ( !font->isT1 && charstringIndex >= CF2_MAX_SUBR )       ||
+               (  font->isT1 && charstringIndex >= T1_MAX_SUBRS_CALLS ) )
           {
             /* max subr plus one for charstring */
             lastError = FT_THROW( Invalid_Glyph_Format );
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/psaux/psstack.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/psaux/psstack.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/psaux/psstack.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/psaux/psstack.c	2026-11-15 23:20:43.000000000 +0000
@@ -211,7 +211,7 @@
                      CF2_UInt   idx,
                      CF2_Fixed  val )
   {
-    if ( idx > cf2_stack_count( stack ) )
+    if ( idx >= cf2_stack_count( stack ) )
     {
       CF2_SET_ERROR( stack->error, Stack_Overflow );
       return;
@@ -245,6 +245,7 @@
     CF2_StackNumber  last = { { 0 }, CF2_NumberInt };
 
     CF2_Int  start_idx, idx, i;
+    CF2_Int  offset;
 
 
     if ( count < 2 )
@@ -256,6 +257,8 @@
       return;
     }
 
+    offset = (CF2_Int)cf2_stack_count( stack ) - count;
+
     /* before C99 it is implementation-defined whether    */
     /* the result of `%' is negative if the first operand */
     /* is negative                                        */
@@ -303,7 +306,7 @@
       {
         start_idx++;
         idx  = start_idx;
-        last = stack->buffer[idx];
+        last = stack->buffer[idx + offset];
       }
 
       idx += shift;
@@ -312,9 +315,9 @@
       else if ( idx < 0 )
         idx += count;
 
-      tmp                = stack->buffer[idx];
-      stack->buffer[idx] = last;
-      last               = tmp;
+      tmp                         = stack->buffer[idx + offset];
+      stack->buffer[idx + offset] = last;
+      last                        = tmp;
     }
   }
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c	2026-11-15 23:20:43.000000000 +0000
@@ -1622,15 +1622,14 @@
 
     tag = FT_CURVE_TAG( tags[0] );
 
-    /* A contour cannot start with a cubic control point! */
-    if ( tag == FT_CURVE_TAG_CUBIC )
-      goto Invalid_Outline;
-
     /* check first point to determine origin */
-    if ( tag == FT_CURVE_TAG_CONIC )
+    if ( tag != FT_CURVE_TAG_ON )
     {
-      /* first point is conic control.  Yes, this happens. */
-      if ( FT_CURVE_TAG( ras.outline.tags[last] ) == FT_CURVE_TAG_ON )
+      UInt  last_tag = FT_CURVE_TAG( ras.outline.tags[last] );
+
+
+      /* first point is a control point.  Yes, this happens. */
+      if ( last_tag == FT_CURVE_TAG_ON )
       {
         /* start at last point if it is on the curve */
         v_start = v_last;
@@ -1638,9 +1637,12 @@
       }
       else
       {
-        /* if both first and last points are conic,         */
-        /* start at their middle and record its position    */
-        /* for closure                                      */
+        if ( last_tag != tag )
+          goto Invalid_Outline;
+
+        /* if both first and last points are controls,   */
+        /* start at their middle and record its position */
+        /* for closure                                   */
         v_start.x = ( v_start.x + v_last.x ) / 2;
         v_start.y = ( v_start.y + v_last.y ) / 2;
 
@@ -1755,14 +1757,30 @@
 
           if ( point <= limit )
           {
+            tag = FT_CURVE_TAG( tags[0] );
+
             x3 = SCALED( point[0].x );
             y3 = SCALED( point[0].y );
 
             if ( flipped )
               SWAP_( x3, y3 );
 
+            if ( tag == FT_CURVE_TAG_CUBIC )
+            {
+              x3 = ( x2 + x3 ) / 2;
+              y3 = ( y2 + y3 ) / 2;
+            }
+            else if ( tag != FT_CURVE_TAG_ON )
+              goto Invalid_Outline;
+
             if ( Cubic_To( RAS_VARS x1, y1, x2, y2, x3, y3 ) )
               goto Fail;
+
+            if ( tag == FT_CURVE_TAG_CUBIC )
+            {
+              point--;
+              tags--;
+            }
             continue;
           }
 
@@ -2447,9 +2465,8 @@
                                Int   y_min,
                                Int   y_max )
   {
-    Int  y_mid;
-    Int  band_top = 0;
-    Int  band_stack[32];  /* enough to bisect 32-bit int bands */
+    Int   band_stack[32];  /* enough to bisect 32-bit int bands */
+    Int*  band = band_stack;
 
 
     FT_TRACE6(( "%s pass [%d..%d]\n",
@@ -2476,10 +2493,8 @@
         FT_TRACE6(( "band [%d..%d]: to be bisected\n",
                     y_min, y_max ));
 
-        y_mid = ( y_min + y_max ) >> 1;
-
-        band_stack[band_top++] = y_min;
-        y_min                  = y_mid + 1;
+        *band++ = y_min;
+        y_min   = ( y_min + y_max + 1 ) >> 1;
       }
       else
       {
@@ -2490,11 +2505,11 @@
         if ( ras.fProfile )
           Draw_Sweep( RAS_VAR );
 
-        if ( --band_top < 0 )
-          break;
+        if ( band == band_stack )
+          break;  /* done */
 
         y_max = y_min - 1;
-        y_min = band_stack[band_top];
+        y_min = *--band;
       }
     }
 
@@ -2517,11 +2532,7 @@
   Render_Glyph( RAS_ARG )
   {
     FT_Error  error;
-    Long      buffer[FT_MAX_BLACK_POOL];
-
 
-    ras.buff     = buffer;
-    ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
 
     Set_High_Precision( RAS_VARS ras.outline.flags &
                                  FT_OUTLINE_HIGH_PRECISION );
@@ -2665,6 +2676,9 @@
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
     const FT_Bitmap*   target_map = params->target;
 
+    FT_ULong  estimate;
+    int       ret;
+
 #ifndef FT_STATIC_RASTER
     black_TWorker  worker[1];
 #endif
@@ -2712,7 +2726,36 @@
     if ( ras.bPitch > 0 )
       ras.bOrigin += ras.bTop * ras.bPitch;
 
-    return Render_Glyph( RAS_VAR );
+    /* allocate memory based on empirical estimate from CJK fonts */
+    estimate = ( ras.bTop + ras.bRight ) * 8UL +
+               80UL * sizeof ( TProfile ) / sizeof ( Long );
+    if ( estimate > FT_MAX_BLACK_POOL )
+    {
+      FT_Error   error;
+      FT_Memory  memory = (FT_Memory)((black_PRaster)raster)->memory;
+
+
+      if ( FT_QNEW_ARRAY( ras.buff, estimate ) )
+        ret = error;
+      else
+      {
+        ras.sizeBuff = ras.buff + estimate;
+        ret = Render_Glyph( RAS_VAR );
+        FT_FREE( ras.buff );
+      }
+    }
+    else
+    {
+      Long  buffer[FT_MAX_BLACK_POOL];  /* stack allocation */
+
+
+      ras.buff     = buffer;
+      ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
+
+      ret = Render_Glyph( RAS_VAR );
+    }
+
+    return ret;
   }
 
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c	2026-11-15 23:20:43.000000000 +0000
@@ -34,6 +34,10 @@
 #include 
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include 
+#endif
+
 #include "sferrors.h"
 
 #ifdef TT_CONFIG_OPTION_BDF
@@ -440,7 +444,10 @@
 
     if ( tag == TTAG_ttcf )
     {
-      FT_Int  n;
+      FT_ULong  version;
+      FT_ULong  count;
+      FT_Bool   has_extended_offsets;
+      FT_Int    n;
 
 
       FT_TRACE3(( "sfnt_open_font: file is a collection\n" ));
@@ -448,10 +455,13 @@
       if ( FT_STREAM_READ_FIELDS( ttc_header_fields, &face->ttc_header ) )
         return error;
 
-      FT_TRACE3(( "                with %ld subfonts\n",
-                  face->ttc_header.count ));
+      version = (FT_ULong)face->ttc_header.version;
+      count   = (FT_ULong)face->ttc_header.count;
 
-      if ( face->ttc_header.count == 0 )
+      has_extended_offsets = ( version >> 16 == 1 || version >> 16 == 2 ) &&
+                             ( version & 0xFFFF ) >= 1;
+
+      if ( !has_extended_offsets && face->ttc_header.count == 0 )
         return FT_THROW( Invalid_Table );
 
       /* a rough size estimate: let's conservatively assume that there   */
@@ -459,7 +469,38 @@
       /* 28 bytes), thus we have (at least) `12 + 4*count' bytes for the */
       /* size of the TTC header plus `28*count' bytes for all subfont    */
       /* headers                                                         */
-      if ( (FT_ULong)face->ttc_header.count > stream->size / ( 28 + 4 ) )
+      if ( count > stream->size / ( 28 + 4 ) )
+        return FT_THROW( Array_Too_Large );
+
+      if ( has_extended_offsets )
+      {
+        FT_TRACE3(( "                with %lu compatibility subfonts\n",
+                    count ));
+
+        if ( FT_STREAM_SKIP( count * 4L ) )
+          return error;
+
+        /* In version 2.1 the extended count and offsets follow the */
+        /* three version 2 DSIG fields.                             */
+        if ( version >> 16 == 2 && FT_STREAM_SKIP( 12 ) )
+          return error;
+
+        if ( FT_READ_ULONG( count ) )
+          return error;
+
+        if ( count > FT_LONG_MAX )
+          return FT_THROW( Array_Too_Large );
+
+        face->ttc_header.count = (FT_Long)count;
+      }
+
+      FT_TRACE3(( "                with %ld subfonts\n",
+                  face->ttc_header.count ));
+
+      if ( face->ttc_header.count == 0 )
+        return FT_THROW( Invalid_Table );
+
+      if ( count > stream->size / ( 28 + 4 ) )
         return FT_THROW( Array_Too_Large );
 
       /* now read the offsets of each font in the file */
@@ -557,6 +598,24 @@
                          0 );
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+    if ( !face->tt_varc )
+    {
+      /* we want the VARC implementation from the `truetype' module only */
+      FT_Module  tt_module = FT_Get_Module( library, "truetype" );
+
+
+      face->tt_varc = ft_module_get_service( tt_module,
+                                             FT_SERVICE_ID_VARC,
+                                             0 );
+    }
+
+    if ( !face->face_varc )
+      face->face_varc = ft_module_get_service( &face->root.driver->root,
+                                               FT_SERVICE_ID_VARC,
+                                               0 );
+#endif
+
     FT_TRACE2(( "SFNT driver\n" ));
 
     error = sfnt_open_font( stream,
@@ -719,10 +778,12 @@
       FT_FREE( default_values );
       FT_FREE( instance_values );
 
-      /* we don't support Multiple Master CFFs yet; */
-      /* note that `glyf' or `CFF2' have precedence */
-      if ( face->goto_table( face, TTAG_glyf, stream, 0 ) &&
+      /* we don't support Multiple Master CFFs yet;          */
+      /* note that 'GLYF', 'glyf', or 'CFF2' have precedence */
+      if ( face->goto_table( face, TTAG_GLYF, stream, 0 ) &&
+           face->goto_table( face, TTAG_glyf, stream, 0 ) &&
            face->goto_table( face, TTAG_CFF2, stream, 0 ) &&
+           face->goto_table( face, TTAG_hvgl, stream, 0 ) &&
            !face->goto_table( face, TTAG_CFF, stream, 0 ) )
         num_instances = 0;
 
@@ -862,12 +923,20 @@
 
     /* do we have outlines in there? */
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
+    face->is_extended_glyf =
+      FT_BOOL( tt_face_lookup_table( face, TTAG_GLYF ) );
+
     has_outline = FT_BOOL( face->root.internal->incremental_interface ||
+                           face->is_extended_glyf                     ||
                            tt_face_lookup_table( face, TTAG_glyf )    ||
                            tt_face_lookup_table( face, TTAG_CFF )     ||
                            tt_face_lookup_table( face, TTAG_CFF2 )    );
 #else
-    has_outline = FT_BOOL( tt_face_lookup_table( face, TTAG_glyf ) ||
+    face->is_extended_glyf =
+      FT_BOOL( tt_face_lookup_table( face, TTAG_GLYF ) );
+
+    has_outline = FT_BOOL( face->is_extended_glyf                  ||
+                           tt_face_lookup_table( face, TTAG_glyf ) ||
                            tt_face_lookup_table( face, TTAG_CFF )  ||
                            tt_face_lookup_table( face, TTAG_CFF2 ) );
 #endif
@@ -950,6 +1019,7 @@
                  get_glyph_metrics                                 )
           {
             face->horizontal.number_Of_HMetrics = 0;
+            face->horz_metrics_count            = 0;
             error                               = FT_Err_Ok;
           }
 #endif
@@ -977,6 +1047,7 @@
                  get_glyph_metrics                                 )
           {
             face->horizontal.number_Of_HMetrics = 0;
+            face->horz_metrics_count            = 0;
             error                               = FT_Err_Ok;
           }
 #endif
@@ -1024,6 +1095,27 @@
       LOAD_( colr );
     }
 
+#ifdef TT_CONFIG_OPTION_VARC
+    /* variable composite glyph support */
+    if ( face->face_varc )
+    {
+      FT_Service_VARC  varc = (FT_Service_VARC)face->face_varc;
+
+
+      FT_TRACE2(( "'VARC' " ));
+      FT_TRACE3(( "-->\n" ));
+
+      error = varc->load( (FT_Face)face, stream );
+
+      FT_TRACE2(( "%s\n", ( !error )
+                            ? "loaded"
+                            : FT_ERR_EQ( error, Table_Missing )
+                              ? "missing"
+                              : "failed to load" ));
+      FT_TRACE3(( "\n" ));
+    }
+#endif
+
     /* OpenType-SVG glyph support */
     if ( sfnt->load_svg )
       LOAD_( svg );
@@ -1037,7 +1129,7 @@
     LOAD_( gpos );
 #endif
 
-    face->root.num_glyphs = face->max_profile.numGlyphs;
+    face->root.num_glyphs = face->maxp_num_glyphs;
 
     /* Bit 8 of the `fsSelection' field in the `OS/2' table denotes  */
     /* a WWS-only font face.  `WWS' stands for `weight', width', and */
@@ -1190,13 +1282,10 @@
 
       tt_face_build_cmaps( face );  /* ignore errors */
 
-
       /* set the encoding fields */
       {
         FT_Int   m;
-#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-        FT_Bool  has_unicode = FALSE;
-#endif
+        FT_UInt  n;
 
 
         for ( m = 0; m < root->num_charmaps; m++ )
@@ -1206,38 +1295,58 @@
 
           charmap->encoding = sfnt_find_encoding( charmap->platform_id,
                                                   charmap->encoding_id );
+        }
+
+        for ( n = 0; n < face->num_dmap_charmaps; n++ )
+        {
+          FT_CharMap  charmap = &face->dmap_charmaps[n]->charmap;
 
-#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
 
-          if ( charmap->encoding == FT_ENCODING_UNICODE   ||
-               charmap->encoding == FT_ENCODING_MS_SYMBOL )  /* PUA */
-            has_unicode = TRUE;
+          charmap->encoding = sfnt_find_encoding( charmap->platform_id,
+                                                  charmap->encoding_id );
         }
 
-        /* synthesize Unicode charmap if one is missing */
-        if ( !has_unicode                                &&
-             root->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
+        tt_face_build_dmaps( face );  /* ignore errors */
+
+#ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
         {
-          FT_CharMapRec  cmaprec;
+          FT_Bool  has_unicode = FALSE;
 
 
-          cmaprec.face        = root;
-          cmaprec.platform_id = TT_PLATFORM_MICROSOFT;
-          cmaprec.encoding_id = TT_MS_ID_UNICODE_CS;
-          cmaprec.encoding    = FT_ENCODING_UNICODE;
+          for ( m = 0; m < root->num_charmaps; m++ )
+          {
+            FT_CharMap  charmap = root->charmaps[m];
 
 
-          error = FT_CMap_New( (FT_CMap_Class)&tt_cmap_unicode_class_rec,
-                               NULL, &cmaprec, NULL );
-          if ( error                                      &&
-               FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) &&
-               FT_ERR_NEQ( error, Unimplemented_Feature ) )
-            goto Exit;
-          error = FT_Err_Ok;
+            if ( charmap->encoding == FT_ENCODING_UNICODE   ||
+                 charmap->encoding == FT_ENCODING_MS_SYMBOL )  /* PUA */
+              has_unicode = TRUE;
+          }
 
-#endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
+          /* synthesize Unicode charmap if one is missing */
+          if ( !has_unicode                                &&
+               root->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
+          {
+            FT_CharMapRec  cmaprec;
 
+
+            cmaprec.face        = root;
+            cmaprec.platform_id = TT_PLATFORM_MICROSOFT;
+            cmaprec.encoding_id = TT_MS_ID_UNICODE_CS;
+            cmaprec.encoding    = FT_ENCODING_UNICODE;
+
+
+            error = FT_CMap_New( (FT_CMap_Class)&tt_cmap_unicode_class_rec,
+                                 NULL, &cmaprec, NULL );
+            if ( error                                      &&
+                 FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) &&
+                 FT_ERR_NEQ( error, Unimplemented_Feature ) )
+              goto Exit;
+            error = FT_Err_Ok;
+          }
         }
+
+#endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
       }
 
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
@@ -1470,6 +1579,17 @@
         sfnt->free_colr( face );
       }
 
+#ifdef TT_CONFIG_OPTION_VARC
+      /* free VARC data */
+      if ( face->face_varc )
+      {
+        FT_Service_VARC  varc = (FT_Service_VARC)face->face_varc;
+
+
+        varc->done( (FT_Face)face );
+      }
+#endif
+
 #ifdef FT_CONFIG_OPTION_SVG
       /* free SVG data */
       if ( sfnt->free_svg )
@@ -1502,9 +1622,14 @@
       FT_Stream  stream = FT_FACE_STREAM( face );
 
 
-      /* simply release the 'cmap' table frame */
+      tt_face_done_dmaps( face );
+
+      /* simply release the 'cmap' and 'DMAP' table frames */
       FT_FRAME_RELEASE( face->cmap_table );
       face->cmap_size = 0;
+
+      FT_FRAME_RELEASE( face->dmap_table );
+      face->dmap_size = 0;
     }
 
     face->horz_metrics_size = 0;
@@ -1549,6 +1674,11 @@
     FT_FREE( face->palette );
 
     face->sfnt = NULL;
+
+#ifdef TT_CONFIG_OPTION_VARC
+    face->tt_varc   = NULL;
+    face->face_varc = NULL;
+#endif
   }
 
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c	2026-11-15 23:20:43.000000000 +0000
@@ -310,8 +310,12 @@
       woff_offset += woff.privLength;
     }
 
-    if ( sfnt_offset != woff.totalSfntSize ||
-         woff_offset != woff.length        )
+    /* Reject unrealistic size or compression factor */
+    if ( sfnt_offset > 0x4000000UL          ||
+         ( sfnt_offset >> 6 ) > woff_offset ||
+         sfnt_offset != woff.totalSfntSize  ||
+         woff_offset != woff.length         )
+
     {
       FT_ERROR(( "woff_font_open: invalid `sfnt' table structure\n" ));
       error = FT_THROW( Invalid_Table );
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c	2026-11-15 23:20:43.000000000 +0000
@@ -17,6 +17,7 @@
 
 
 #include 
+#include 
 
 #include "sferrors.h"                      /* must come before `ftvalid.h' */
 
@@ -2936,7 +2937,8 @@
    * Ranges are sorted by `uniStart'.
    */
 
-#ifdef TT_CONFIG_CMAP_FORMAT_14
+#if defined( TT_CONFIG_CMAP_FORMAT_14 ) || \
+    defined( TT_CONFIG_CMAP_FORMAT_15 )
 
   typedef struct  TT_CMap14Rec_
   {
@@ -3009,9 +3011,23 @@
   }
 
 
-  FT_CALLBACK_DEF( FT_Error )
-  tt_cmap14_validate( FT_Byte*      table,
-                      FT_Validator  valid )
+  static FT_Bool
+  tt_cmap14_is_extended( FT_CMap  cmap )
+  {
+    TT_CMap        ttcmap = (TT_CMap)cmap;
+    TT_CMap_Class  clazz  = (TT_CMap_Class)( ttcmap->cmap_class
+                                               ? ttcmap->cmap_class
+                                               : cmap->clazz );
+
+
+    return FT_BOOL( clazz->format == 15 );
+  }
+
+
+  static FT_Error
+  tt_cmap14_validate_internal( FT_Byte*      table,
+                               FT_Validator  valid,
+                               FT_Bool       is_extended )
   {
     FT_Byte*  p;
     FT_ULong  length;
@@ -3092,9 +3108,10 @@
         /* and the non-default table (these glyphs are specified here) */
         if ( nondefOff != 0 )
         {
-          FT_Byte*  ndp        = table + nondefOff;
+          FT_Byte*  ndp         = table + nondefOff;
           FT_ULong  numMappings;
-          FT_ULong  i, lastUni = 0;
+          FT_UInt   record_size = is_extended ? 6 : 5;
+          FT_ULong  i, lastUni  = 0;
 
 
           if ( ndp + 4 > valid->limit )
@@ -3102,14 +3119,15 @@
 
           numMappings = TT_NEXT_ULONG( ndp );
 
-          /* numMappings * 5 > (FT_ULong)( valid->limit - ndp ) ? */
-          if ( numMappings > ( (FT_ULong)( valid->limit - ndp ) ) / 5 )
+          if ( numMappings >
+                 ( (FT_ULong)( valid->limit - ndp ) ) / record_size )
             FT_INVALID_TOO_SHORT;
 
           for ( i = 0; i < numMappings; i++ )
           {
             FT_ULong  uni = TT_NEXT_UINT24( ndp );
-            FT_ULong  gid = TT_NEXT_USHORT( ndp );
+            FT_ULong  gid = is_extended ? TT_NEXT_UINT24( ndp )
+                                        : TT_NEXT_USHORT( ndp );
 
 
             if ( uni >= 0x110000UL )                     /* end of Unicode */
@@ -3132,6 +3150,30 @@
   }
 
 
+#ifdef TT_CONFIG_CMAP_FORMAT_14
+
+  FT_CALLBACK_DEF( FT_Error )
+  tt_cmap14_validate( FT_Byte*      table,
+                      FT_Validator  valid )
+  {
+    return tt_cmap14_validate_internal( table, valid, FALSE );
+  }
+
+#endif /* TT_CONFIG_CMAP_FORMAT_14 */
+
+
+#ifdef TT_CONFIG_CMAP_FORMAT_15
+
+  FT_CALLBACK_DEF( FT_Error )
+  tt_cmap15_validate( FT_Byte*      table,
+                      FT_Validator  valid )
+  {
+    return tt_cmap14_validate_internal( table, valid, TRUE );
+  }
+
+#endif /* TT_CONFIG_CMAP_FORMAT_15 */
+
+
   FT_CALLBACK_DEF( FT_UInt )
   tt_cmap14_char_index( FT_CMap    cmap,
                         FT_UInt32  char_code )
@@ -3160,9 +3202,13 @@
   tt_cmap14_get_info( FT_CharMap    cmap,
                       TT_CMapInfo  *cmap_info )
   {
-    FT_UNUSED( cmap );
+    TT_CMap        ttcmap = (TT_CMap)cmap;
+    TT_CMap_Class  clazz  = (TT_CMap_Class)( ttcmap->cmap_class
+                                               ? ttcmap->cmap_class
+                                               : FT_CMAP( cmap )->clazz );
 
-    cmap_info->format   = 14;
+
+    cmap_info->format   = clazz->format;
     /* subtable 14 does not define a language field */
     cmap_info->language = 0xFFFFFFFFUL;
 
@@ -3206,10 +3252,12 @@
 
   static FT_UInt
   tt_cmap14_char_map_nondef_binary( FT_Byte    *base,
-                                    FT_UInt32   char_code )
+                                    FT_UInt32   char_code,
+                                    FT_Bool     is_extended )
   {
     FT_UInt32  numMappings = TT_PEEK_ULONG( base );
     FT_UInt32  max, min;
+    FT_UInt    record_size = is_extended ? 6 : 5;
 
 
     min = 0;
@@ -3221,7 +3269,7 @@
     while ( min < max )
     {
       FT_UInt32  mid = ( min + max ) >> 1;
-      FT_Byte*   p   = base + 5 * mid;
+      FT_Byte*   p   = base + record_size * mid;
       FT_UInt32  uni = (FT_UInt32)TT_NEXT_UINT24( p );
 
 
@@ -3230,7 +3278,7 @@
       else if ( char_code > uni )
         min = mid + 1;
       else
-        return TT_PEEK_USHORT( p );
+        return is_extended ? TT_PEEK_UINT24( p ) : TT_PEEK_USHORT( p );
     }
 
     return 0;
@@ -3278,6 +3326,7 @@
   {
     TT_CMap  ttcmap  = (TT_CMap)cmap;
     TT_CMap  ttucmap = (TT_CMap)ucmap;
+    FT_Bool  is_extended = tt_cmap14_is_extended( cmap );
 
     FT_Byte*  p = tt_cmap14_find_variant( ttcmap->data + 6,
                                           variantSelector );
@@ -3301,7 +3350,8 @@
 
     if ( nondefOff != 0 )
       return tt_cmap14_char_map_nondef_binary( ttcmap->data + nondefOff,
-                                               charcode );
+                                               charcode,
+                                               is_extended );
 
     return 0;
   }
@@ -3313,6 +3363,7 @@
                                 FT_UInt32  variantSelector )
   {
     TT_CMap   ttcmap = (TT_CMap)cmap;
+    FT_Bool   is_extended = tt_cmap14_is_extended( cmap );
     FT_Byte*  p      = tt_cmap14_find_variant( ttcmap->data + 6,
                                                variantSelector );
     FT_ULong  defOff;
@@ -3331,7 +3382,8 @@
 
     if ( nondefOff != 0                                              &&
          tt_cmap14_char_map_nondef_binary( ttcmap->data + nondefOff,
-                                           charcode ) != 0           )
+                                           charcode,
+                                           is_extended ) != 0        )
       return 0;
 
     return -1;
@@ -3375,6 +3427,7 @@
     FT_UInt32   count  = cmap14->num_selectors;
     FT_Byte*    p      = ttcmap->data + 10;
     FT_UInt32*  q;
+    FT_Bool     is_extended = tt_cmap14_is_extended( cmap );
 
 
     if ( tt_cmap14_ensure( cmap14, ( count + 1 ), memory ) )
@@ -3392,7 +3445,8 @@
                                             charCode )                   ) ||
            ( nondefOff != 0                                              &&
              tt_cmap14_char_map_nondef_binary( ttcmap->data + nondefOff,
-                                               charCode ) != 0           ) )
+                                               charCode,
+                                               is_extended ) != 0        ) )
       {
         q[0] = varSel;
         q++;
@@ -3462,7 +3516,8 @@
   static FT_UInt32*
   tt_cmap14_get_nondef_chars( TT_CMap     cmap,
                               FT_Byte    *p,
-                              FT_Memory   memory )
+                              FT_Memory   memory,
+                              FT_Bool     is_extended )
   {
     TT_CMap14   cmap14 = (TT_CMap14) cmap;
     FT_UInt32   numMappings;
@@ -3479,7 +3534,7 @@
     for ( i = 0; i < numMappings; i++ )
     {
       ret[i] = (FT_UInt32)TT_NEXT_UINT24( p );
-      p += 2;
+      p += is_extended ? 3 : 2;
     }
     ret[i] = 0;
 
@@ -3495,6 +3550,7 @@
     TT_CMap   ttcmap = (TT_CMap)cmap;
     FT_Byte  *p      = tt_cmap14_find_variant( ttcmap->data + 6,
                                                variantSelector );
+    FT_Bool   is_extended = tt_cmap14_is_extended( cmap );
     FT_Int    i;
     FT_ULong  defOff;
     FT_ULong  nondefOff;
@@ -3511,7 +3567,7 @@
 
     if ( defOff == 0 )
       return tt_cmap14_get_nondef_chars( ttcmap, ttcmap->data + nondefOff,
-                                         memory );
+                                         memory, is_extended );
     else if ( nondefOff == 0 )
       return tt_cmap14_get_def_chars( ttcmap, ttcmap->data + defOff,
                                       memory );
@@ -3543,7 +3599,7 @@
                                         memory );
       if ( dcnt == 0 )
         return tt_cmap14_get_nondef_chars( ttcmap, ttcmap->data + nondefOff,
-                                           memory );
+                                           memory, is_extended );
 
       if ( tt_cmap14_ensure( cmap14, ( dcnt + numMappings + 1 ), memory ) )
         return NULL;
@@ -3553,7 +3609,7 @@
       dcnt = FT_NEXT_BYTE( dp );
       di   = 1;
       nuni = (FT_UInt32)TT_NEXT_UINT24( p );
-      p   += 2;
+      p   += is_extended ? 3 : 2;
       ni   = 1;
       i    = 0;
 
@@ -3583,7 +3639,7 @@
             break;
 
           nuni = (FT_UInt32)TT_NEXT_UINT24( p );
-          p += 2;
+          p += is_extended ? 3 : 2;
         }
       }
 
@@ -3596,7 +3652,7 @@
         while ( ni < numMappings )
         {
           ret[i++] = (FT_UInt32)TT_NEXT_UINT24( p );
-          p += 2;
+          p += is_extended ? 3 : 2;
           ni++;
         }
       }
@@ -3626,6 +3682,8 @@
   }
 
 
+#ifdef TT_CONFIG_CMAP_FORMAT_14
+
   FT_DEFINE_TT_CMAP(
     tt_cmap14_class_rec,
 
@@ -3651,6 +3709,35 @@
 #endif /* TT_CONFIG_CMAP_FORMAT_14 */
 
 
+#ifdef TT_CONFIG_CMAP_FORMAT_15
+
+  FT_DEFINE_TT_CMAP(
+    tt_cmap15_class_rec,
+
+      sizeof ( TT_CMap14Rec ),
+
+      (FT_CMap_InitFunc)     tt_cmap14_init,        /* init       */
+      (FT_CMap_DoneFunc)     tt_cmap14_done,        /* done       */
+      (FT_CMap_CharIndexFunc)tt_cmap14_char_index,  /* char_index */
+      (FT_CMap_CharNextFunc) tt_cmap14_char_next,   /* char_next  */
+
+      /* Format 15 extension functions */
+      (FT_CMap_CharVarIndexFunc)    tt_cmap14_char_var_index,
+      (FT_CMap_CharVarIsDefaultFunc)tt_cmap14_char_var_isdefault,
+      (FT_CMap_VariantListFunc)     tt_cmap14_variants,
+      (FT_CMap_CharVariantListFunc) tt_cmap14_char_variants,
+      (FT_CMap_VariantCharListFunc) tt_cmap14_variant_chars,
+
+    15,
+    (TT_CMap_ValidateFunc)tt_cmap15_validate,  /* validate      */
+    (TT_CMap_Info_GetFunc)tt_cmap14_get_info   /* get_cmap_info */
+  )
+
+#endif /* TT_CONFIG_CMAP_FORMAT_15 */
+
+#endif /* TT_CONFIG_CMAP_FORMAT_14 || TT_CONFIG_CMAP_FORMAT_15 */
+
+
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/
@@ -3773,22 +3860,506 @@
   };
 
 
-  /* parse the `cmap' table and build the corresponding TT_CMap objects */
-  /* in the current face                                                */
-  /*                                                                    */
-  FT_LOCAL_DEF( FT_Error )
-  tt_face_build_cmaps( TT_Face  face )
+  static void
+  tt_cmap_free( FT_CMap  cmap )
+  {
+    FT_Memory  memory = FT_FACE_MEMORY( cmap->charmap.face );
+
+
+    if ( cmap->clazz->done )
+      cmap->clazz->done( cmap );
+
+    FT_FREE( cmap );
+  }
+
+
+  static FT_Error
+  tt_cmap_new( FT_CMap_Class  clazz,
+               FT_Pointer     init_data,
+               FT_CharMap     charmap,
+               FT_CMap       *acmap )
+  {
+    FT_Error   error  = FT_Err_Ok;
+    FT_Memory  memory = FT_FACE_MEMORY( charmap->face );
+    FT_CMap    cmap   = NULL;
+
+
+    if ( !FT_ALLOC( cmap, clazz->size ) )
+    {
+      cmap->charmap = *charmap;
+      cmap->clazz   = clazz;
+
+      if ( clazz->init )
+      {
+        error = clazz->init( cmap, init_data );
+        if ( error )
+          goto Fail;
+      }
+    }
+
+    *acmap = cmap;
+    return error;
+
+  Fail:
+    tt_cmap_free( cmap );
+    *acmap = NULL;
+    return error;
+  }
+
+
+  static FT_Error
+  tt_face_add_dmap( TT_Face        face,
+                    FT_CMap_Class  clazz,
+                    FT_Pointer     init_data,
+                    FT_CharMap     charmap,
+                    FT_Int         flags )
+  {
+    FT_Error   error;
+    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_CMap    cmap;
+    FT_UInt    count  = face->num_dmap_charmaps;
+
+
+    error = tt_cmap_new( clazz, init_data, charmap, &cmap );
+    if ( error )
+      return error;
+
+    ((TT_CMap)cmap)->flags = flags;
+
+    if ( FT_QRENEW_ARRAY( face->dmap_charmaps, count, count + 1 ) )
+    {
+      tt_cmap_free( cmap );
+      return error;
+    }
+
+    face->dmap_charmaps[count] = cmap;
+    face->num_dmap_charmaps    = count + 1;
+
+    return FT_Err_Ok;
+  }
+
+
+  static FT_Bool
+  tt_cmap_is_variation( FT_CMap  cmap )
+  {
+    TT_CMap        ttcmap = (TT_CMap)cmap;
+    TT_CMap_Class  clazz  = (TT_CMap_Class)( ttcmap->cmap_class
+                                               ? ttcmap->cmap_class
+                                               : cmap->clazz );
+
+
+    return FT_BOOL( clazz->format == 14 || clazz->format == 15 );
+  }
+
+
+  static FT_CMap
+  tt_face_find_unicode_dmap( TT_Face  face )
+  {
+    FT_CMap*  first = face->dmap_charmaps;
+    FT_CMap*  cur;
+
+
+    if ( !first )
+      return NULL;
+
+    cur = first + face->num_dmap_charmaps;
+    for ( ; --cur >= first; )
+    {
+      FT_CMap  cmap = cur[0];
+
+
+      if ( !cmap                                         ||
+           tt_cmap_is_variation( cmap )                  ||
+           cmap->charmap.encoding != FT_ENCODING_UNICODE )
+        continue;
+
+      if ( ( cmap->charmap.platform_id == TT_PLATFORM_MICROSOFT &&
+             cmap->charmap.encoding_id == TT_MS_ID_UCS_4        )      ||
+           ( cmap->charmap.platform_id == TT_PLATFORM_APPLE_UNICODE &&
+             cmap->charmap.encoding_id == TT_APPLE_ID_UNICODE_32    )  ||
+           ( cmap->charmap.platform_id == TT_PLATFORM_APPLE_UNICODE  &&
+             cmap->charmap.encoding_id == TT_APPLE_ID_FULL_UNICODE   &&
+             ( (TT_CMap_Class)cmap->clazz )->format == 13            ) )
+        return cmap;
+    }
+
+    cur = first + face->num_dmap_charmaps;
+    for ( ; --cur >= first; )
+    {
+      FT_CMap  cmap = cur[0];
+
+
+      if ( cmap                                          &&
+           !tt_cmap_is_variation( cmap )                 &&
+           cmap->charmap.encoding == FT_ENCODING_UNICODE )
+        return cmap;
+    }
+
+    return NULL;
+  }
+
+
+  static FT_CMap
+  tt_face_find_dmap( TT_Face     face,
+                     FT_CharMap  charmap )
+  {
+    FT_CMap*  first = face->dmap_charmaps;
+    FT_CMap*  cur;
+
+
+    if ( !first )
+      return NULL;
+
+    if ( tt_cmap_is_variation( FT_CMAP( charmap ) ) )
+    {
+      cur = first + face->num_dmap_charmaps;
+      for ( ; --cur >= first; )
+        if ( cur[0] && tt_cmap_is_variation( cur[0] ) )
+          return cur[0];
+
+      return NULL;
+    }
+
+    if ( charmap->encoding == FT_ENCODING_UNICODE )
+      return tt_face_find_unicode_dmap( face );
+
+    cur = first + face->num_dmap_charmaps;
+    for ( ; --cur >= first; )
+    {
+      FT_CMap  cmap = cur[0];
+
+
+      if ( cmap                                              &&
+           !tt_cmap_is_variation( cmap )                     &&
+           cmap->charmap.platform_id == charmap->platform_id &&
+           cmap->charmap.encoding_id == charmap->encoding_id )
+        return cmap;
+    }
+
+    cur = first + face->num_dmap_charmaps;
+    for ( ; --cur >= first; )
+    {
+      FT_CMap  cmap = cur[0];
+
+
+      if ( cmap                                        &&
+           !tt_cmap_is_variation( cmap )               &&
+           cmap->charmap.encoding == charmap->encoding )
+        return cmap;
+    }
+
+    return NULL;
+  }
+
+
+  FT_CALLBACK_DEF( void )
+  tt_cmap_dmap_done( FT_CMap  cmap )
+  {
+    TT_CMap        ttcmap = (TT_CMap)cmap;
+    FT_CMap_Class  clazz  = ttcmap->cmap_class;
+
+
+    cmap->clazz = clazz;
+    if ( clazz->done )
+      clazz->done( cmap );
+  }
+
+
+  FT_CALLBACK_DEF( FT_UInt )
+  tt_cmap_dmap_char_index( FT_CMap    cmap,
+                           FT_UInt32  char_code )
+  {
+    TT_CMap  ttcmap = (TT_CMap)cmap;
+    FT_UInt  result;
+
+
+    result = ttcmap->dmap->clazz->char_index( ttcmap->dmap, char_code );
+    if ( !result )
+      result = ttcmap->cmap_class->char_index( cmap, char_code );
+
+    return result;
+  }
+
+
+  FT_CALLBACK_DEF( FT_UInt )
+  tt_cmap_dmap_char_next( FT_CMap     cmap,
+                          FT_UInt32  *achar_code )
+  {
+    TT_CMap  ttcmap = (TT_CMap)cmap;
+
+    FT_UInt32  dmap_char = *achar_code;
+    FT_UInt32  cmap_char = *achar_code;
+
+    FT_UInt  dmap_glyph;
+    FT_UInt  cmap_glyph;
+
+
+    dmap_glyph = ttcmap->dmap->clazz->char_next( ttcmap->dmap, &dmap_char );
+    cmap_glyph = ttcmap->cmap_class->char_next( cmap, &cmap_char );
+
+    if ( dmap_glyph && ( !cmap_glyph || dmap_char <= cmap_char ) )
+    {
+      *achar_code = dmap_char;
+      return dmap_glyph;
+    }
+
+    *achar_code = cmap_char;
+    return cmap_glyph;
+  }
+
+
+  FT_CALLBACK_DEF( FT_UInt )
+  tt_cmap_dmap_char_var_index( FT_CMap    cmap,
+                               FT_CMap    unicode_cmap,
+                               FT_UInt32  char_code,
+                               FT_UInt32  variant_selector )
+  {
+    TT_CMap        ttcmap = (TT_CMap)cmap;
+    FT_CMap_Class  clazz  = ttcmap->dmap->clazz;
+    FT_Int         is_default;
+
+
+    if ( clazz->char_var_default )
+    {
+      is_default = clazz->char_var_default( ttcmap->dmap,
+                                            char_code,
+                                            variant_selector );
+      if ( is_default == 1 )
+        return unicode_cmap->clazz->char_index( unicode_cmap, char_code );
+      if ( is_default == 0 )
+        return clazz->char_var_index( ttcmap->dmap, unicode_cmap,
+                                      char_code, variant_selector );
+    }
+    else if ( clazz->char_var_index )
+    {
+      FT_UInt  result = clazz->char_var_index( ttcmap->dmap,
+                                               unicode_cmap,
+                                               char_code,
+                                               variant_selector );
+
+
+      if ( result )
+        return result;
+    }
+
+    clazz = ttcmap->cmap_class;
+    if ( clazz->char_var_index )
+      return clazz->char_var_index( cmap, unicode_cmap,
+                                    char_code, variant_selector );
+
+    return 0;
+  }
+
+
+  FT_CALLBACK_DEF( FT_Int )
+  tt_cmap_dmap_char_var_isdefault( FT_CMap    cmap,
+                                   FT_UInt32  char_code,
+                                   FT_UInt32  variant_selector )
+  {
+    TT_CMap        ttcmap = (TT_CMap)cmap;
+    FT_CMap_Class  clazz  = ttcmap->dmap->clazz;
+    FT_Int         result = -1;
+
+
+    if ( clazz->char_var_default )
+      result = clazz->char_var_default( ttcmap->dmap,
+                                        char_code, variant_selector );
+
+    clazz = ttcmap->cmap_class;
+    if ( result == -1 && clazz->char_var_default )
+      result = clazz->char_var_default( cmap, char_code,
+                                        variant_selector );
+
+    return result;
+  }
+
+
+  static FT_UInt32*
+  tt_cmap_dmap_merge( TT_CMap     cmap,
+                      FT_UInt32  *dmap_list,
+                      FT_UInt32  *cmap_list )
+  {
+    TT_Face    face   = (TT_Face)cmap->cmap.charmap.face;
+    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_Error   error  = FT_Err_Ok;
+
+    FT_UInt32  dmap_count = 0;
+    FT_UInt32  cmap_count = 0;
+    FT_UInt32  old_max    = face->dmap_max_results;
+
+    FT_UInt32  i = 0;
+    FT_UInt32  j = 0;
+    FT_UInt32  k = 0;
+
+
+    if ( dmap_list )
+      while ( dmap_list[dmap_count] )
+        dmap_count++;
+    if ( cmap_list )
+      while ( cmap_list[cmap_count] )
+        cmap_count++;
+
+    if ( !dmap_count && !cmap_count )
+      return NULL;
+
+    if ( dmap_count >= 0xFFFFFFFFUL - cmap_count )
+      return NULL;
+
+    if ( dmap_count + cmap_count + 1 > face->dmap_max_results )
+    {
+      if ( FT_QRENEW_ARRAY( face->dmap_results, old_max,
+                            dmap_count + cmap_count + 1 ) )
+        return NULL;
+
+      face->dmap_max_results = dmap_count + cmap_count + 1;
+    }
+
+    while ( i < dmap_count && j < cmap_count )
+    {
+      if ( dmap_list[i] < cmap_list[j] )
+        face->dmap_results[k++] = dmap_list[i++];
+      else if ( cmap_list[j] < dmap_list[i] )
+        face->dmap_results[k++] = cmap_list[j++];
+      else
+      {
+        face->dmap_results[k++] = dmap_list[i++];
+        j++;
+      }
+    }
+
+    while ( i < dmap_count )
+      face->dmap_results[k++] = dmap_list[i++];
+    while ( j < cmap_count )
+      face->dmap_results[k++] = cmap_list[j++];
+
+    face->dmap_results[k] = 0;
+    return face->dmap_results;
+  }
+
+
+  FT_CALLBACK_DEF( FT_UInt32* )
+  tt_cmap_dmap_variants( FT_CMap    cmap,
+                         FT_Memory  memory )
+  {
+    TT_CMap  ttcmap = (TT_CMap)cmap;
+
+    FT_CMap_Class  dclazz = ttcmap->dmap->clazz;
+    FT_CMap_Class  cclazz = ttcmap->cmap_class;
+
+    FT_UInt32*  dmap_list = NULL;
+    FT_UInt32*  cmap_list = NULL;
+
+
+    if ( dclazz->variant_list )
+      dmap_list = dclazz->variant_list( ttcmap->dmap, memory );
+    if ( cclazz->variant_list )
+      cmap_list = cclazz->variant_list( cmap, memory );
+
+    return tt_cmap_dmap_merge( ttcmap, dmap_list, cmap_list );
+  }
+
+
+  FT_CALLBACK_DEF( FT_UInt32* )
+  tt_cmap_dmap_char_variants( FT_CMap    cmap,
+                              FT_Memory  memory,
+                              FT_UInt32  char_code )
+  {
+    TT_CMap  ttcmap = (TT_CMap)cmap;
+
+    FT_CMap_Class  dclazz = ttcmap->dmap->clazz;
+    FT_CMap_Class  cclazz = ttcmap->cmap_class;
+
+    FT_UInt32*  dmap_list = NULL;
+    FT_UInt32*  cmap_list = NULL;
+
+
+    if ( dclazz->charvariant_list )
+      dmap_list = dclazz->charvariant_list( ttcmap->dmap, memory,
+                                            char_code );
+    if ( cclazz->charvariant_list )
+      cmap_list = cclazz->charvariant_list( cmap, memory, char_code );
+
+    return tt_cmap_dmap_merge( ttcmap, dmap_list, cmap_list );
+  }
+
+
+  FT_CALLBACK_DEF( FT_UInt32* )
+  tt_cmap_dmap_variant_chars( FT_CMap    cmap,
+                              FT_Memory  memory,
+                              FT_UInt32  variant_selector )
+  {
+    TT_CMap  ttcmap = (TT_CMap)cmap;
+
+    FT_CMap_Class  dclazz = ttcmap->dmap->clazz;
+    FT_CMap_Class  cclazz = ttcmap->cmap_class;
+
+    FT_UInt32*  dmap_list = NULL;
+    FT_UInt32*  cmap_list = NULL;
+
+
+    if ( dclazz->variantchar_list )
+      dmap_list = dclazz->variantchar_list( ttcmap->dmap, memory,
+                                            variant_selector );
+    if ( cclazz->variantchar_list )
+      cmap_list = cclazz->variantchar_list( cmap, memory,
+                                            variant_selector );
+
+    return tt_cmap_dmap_merge( ttcmap, dmap_list, cmap_list );
+  }
+
+
+  FT_CALLBACK_DEF( FT_Error )
+  tt_cmap_dmap_get_info( FT_CharMap    charmap,
+                         TT_CMapInfo  *cmap_info )
+  {
+    TT_CMap        cmap  = (TT_CMap)charmap;
+    TT_CMap_Class  clazz = (TT_CMap_Class)cmap->cmap_class;
+
+
+    if ( clazz->get_cmap_info )
+      return clazz->get_cmap_info( charmap, cmap_info );
+
+    return FT_THROW( Invalid_CharMap_Format );
+  }
+
+
+  FT_DEFINE_TT_CMAP(
+    tt_cmap_dmap_class_rec,
+
+      sizeof ( TT_CMapRec ),
+
+      (FT_CMap_InitFunc)     NULL,                       /* init       */
+      (FT_CMap_DoneFunc)     tt_cmap_dmap_done,          /* done       */
+      (FT_CMap_CharIndexFunc)tt_cmap_dmap_char_index,    /* char_index */
+      (FT_CMap_CharNextFunc) tt_cmap_dmap_char_next,     /* char_next  */
+
+      (FT_CMap_CharVarIndexFunc)    tt_cmap_dmap_char_var_index,
+      (FT_CMap_CharVarIsDefaultFunc)tt_cmap_dmap_char_var_isdefault,
+      (FT_CMap_VariantListFunc)     tt_cmap_dmap_variants,
+      (FT_CMap_CharVariantListFunc) tt_cmap_dmap_char_variants,
+      (FT_CMap_VariantCharListFunc) tt_cmap_dmap_variant_chars,
+
+    0,
+    (TT_CMap_ValidateFunc)NULL,
+    (TT_CMap_Info_GetFunc)tt_cmap_dmap_get_info
+  )
+
+
+  /* parse a `cmap'-shaped table and build the corresponding TT_CMap */
+  /* objects in the current face                                     */
+  /*                                                                 */
+  static FT_Error
+  tt_face_build_cmaps_from_table( TT_Face   face,
+                                  FT_Byte*  table,
+                                  FT_ULong  table_size,
+                                  FT_Bool   is_dmap )
   {
-    FT_Byte* const     table   = face->cmap_table;
     FT_Byte*           limit;
     FT_UInt volatile   num_cmaps;
-    FT_Byte* volatile  p       = table;
-    FT_Library         library = FT_FACE_LIBRARY( face );
-
-    FT_UNUSED( library );
+    FT_Byte* volatile  p = table;
 
 
-    if ( !p || face->cmap_size < 4 )
+    if ( !p || table_size < 4 )
       return FT_THROW( Invalid_Table );
 
     /* Version 1.8.3 of the OpenType specification contains the following */
@@ -3805,7 +4376,7 @@
     num_cmaps = TT_NEXT_USHORT( p );
     FT_TRACE4(( "tt_face_build_cmaps: %u cmaps\n", num_cmaps ));
 
-    limit = table + face->cmap_size;
+    limit = table + table_size;
     for ( ; num_cmaps > 0 && p + 8 <= limit; num_cmaps-- )
     {
       FT_CharMapRec  charmap;
@@ -3818,7 +4389,7 @@
       charmap.encoding    = FT_ENCODING_NONE;  /* will be filled later */
       offset              = TT_NEXT_ULONG( p );
 
-      if ( offset && offset <= face->cmap_size - 2 )
+      if ( offset && offset <= table_size - 2 )
       {
         FT_Byte* volatile              cmap   = table + offset;
         volatile FT_UInt               format = TT_PEEK_USHORT( cmap );
@@ -3838,7 +4409,7 @@
             ft_validator_init( FT_VALIDATOR( &valid ), cmap, limit,
                                FT_VALIDATE_DEFAULT );
 
-            valid.num_glyphs = (FT_UInt)face->max_profile.numGlyphs;
+            valid.num_glyphs = face->maxp_num_glyphs;
 
             if ( ft_setjmp( FT_VALIDATOR( &valid )->jump_buffer) == 0 )
             {
@@ -3848,20 +4419,31 @@
 
             if ( !valid.validator.error )
             {
-              FT_CMap  ttcmap;
+              FT_CMap   ttcmap;
+              FT_Error  new_error;
 
 
               /* It might make sense to store the single variation         */
               /* selector cmap somewhere special.  But it would have to be */
               /* in the public FT_FaceRec, and we can't change that.       */
 
-              if ( !FT_CMap_New( (FT_CMap_Class)clazz,
-                                 cmap, &charmap, &ttcmap ) )
+              if ( is_dmap )
+                new_error = tt_face_add_dmap( face, (FT_CMap_Class)clazz,
+                                              cmap, &charmap,
+                                              (FT_Int)error );
+              else
+                new_error = FT_CMap_New( (FT_CMap_Class)clazz,
+                                         cmap, &charmap, &ttcmap );
+
+              if ( !new_error && !is_dmap )
               {
                 /* it is simpler to directly set `flags' than adding */
                 /* a parameter to FT_CMap_New                        */
                 ((TT_CMap)ttcmap)->flags = (FT_Int)error;
               }
+
+              if ( new_error && FT_ERR_EQ( new_error, Out_Of_Memory ) )
+                return new_error;
             }
             else
             {
@@ -3884,6 +4466,162 @@
   }
 
 
+  /* parse the 'cmap' and 'DMAP' tables */
+  FT_LOCAL_DEF( FT_Error )
+  tt_face_build_cmaps( TT_Face  face )
+  {
+    FT_Error  error;
+
+
+    error = tt_face_build_cmaps_from_table( face,
+                                            face->cmap_table,
+                                            face->cmap_size,
+                                            FALSE );
+    if ( error || !face->dmap_table )
+      return error;
+
+    return tt_face_build_cmaps_from_table( face,
+                                           face->dmap_table,
+                                           face->dmap_size,
+                                           TRUE );
+  }
+
+
+  static FT_Error
+  tt_face_expose_dmap( TT_Face  face,
+                       FT_CMap  dmap )
+  {
+    FT_Face    root   = FT_FACE( face );
+    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_Error   error  = FT_Err_Ok;
+
+    FT_Int   count = root->num_charmaps;
+    FT_UInt  i;
+
+
+    if ( FT_QRENEW_ARRAY( root->charmaps, count, count + 1 ) )
+      return error;
+
+    root->charmaps[count] = &dmap->charmap;
+    root->num_charmaps    = count + 1;
+
+    for ( i = 0; i < face->num_dmap_charmaps; i++ )
+      if ( face->dmap_charmaps[i] == dmap )
+      {
+        face->dmap_charmaps[i] = NULL;
+        break;
+      }
+
+    return FT_Err_Ok;
+  }
+
+
+  FT_LOCAL_DEF( FT_Error )
+  tt_face_build_dmaps( TT_Face  face )
+  {
+    FT_Face   root = FT_FACE( face );
+    FT_Error  error;
+
+    FT_Int   num_cmaps = root->num_charmaps;
+    FT_Int   i;
+    FT_UInt  j;
+
+
+    if ( !face->num_dmap_charmaps )
+      return FT_Err_Ok;
+
+    /* Apply the best matching DMAP subtable to every selectable cmap. */
+    for ( i = 0; i < num_cmaps; i++ )
+    {
+      FT_CMap  cmap = FT_CMAP( root->charmaps[i] );
+      FT_CMap  dmap = tt_face_find_dmap( face, &cmap->charmap );
+
+
+      if ( dmap )
+      {
+        TT_CMap  ttcmap = (TT_CMap)cmap;
+
+
+        ttcmap->cmap_class = cmap->clazz;
+        ttcmap->dmap       = dmap;
+        cmap->clazz        = (FT_CMap_Class)&tt_cmap_dmap_class_rec;
+      }
+    }
+
+    /* If DMAP supplies an encoding absent from cmap, expose it directly. */
+    for ( j = 0; j < face->num_dmap_charmaps; j++ )
+    {
+      FT_CMap  dmap  = face->dmap_charmaps[j];
+      FT_Bool  found = FALSE;
+
+
+      if ( !dmap || tt_cmap_is_variation( dmap ) )
+        continue;
+
+      for ( i = 0; i < root->num_charmaps; i++ )
+      {
+        FT_CMap  cmap = FT_CMAP( root->charmaps[i] );
+
+
+        if ( !tt_cmap_is_variation( cmap ) &&
+             cmap->charmap.encoding == dmap->charmap.encoding )
+        {
+          found = TRUE;
+          break;
+        }
+      }
+
+      if ( !found )
+      {
+        FT_CMap  best = dmap;
+
+
+        if ( dmap->charmap.encoding == FT_ENCODING_UNICODE )
+          best = tt_face_find_unicode_dmap( face );
+
+        error = tt_face_expose_dmap( face, best );
+        if ( error )
+          return error;
+      }
+    }
+
+    /* A variation subtable is not selectable as an ordinary charmap. */
+    for ( i = 0; i < root->num_charmaps; i++ )
+      if ( tt_cmap_is_variation( FT_CMAP( root->charmaps[i] ) ) )
+        return FT_Err_Ok;
+
+    for ( j = 0; j < face->num_dmap_charmaps; j++ )
+    {
+      FT_CMap  dmap = face->dmap_charmaps[j];
+
+
+      if ( dmap && tt_cmap_is_variation( dmap ) )
+        return tt_face_expose_dmap( face, dmap );
+    }
+
+    return FT_Err_Ok;
+  }
+
+
+  FT_LOCAL_DEF( void )
+  tt_face_done_dmaps( TT_Face  face )
+  {
+    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_UInt    i;
+
+
+    for ( i = 0; i < face->num_dmap_charmaps; i++ )
+      if ( face->dmap_charmaps[i] )
+        tt_cmap_free( face->dmap_charmaps[i] );
+
+    FT_FREE( face->dmap_charmaps );
+    face->num_dmap_charmaps = 0;
+
+    FT_FREE( face->dmap_results );
+    face->dmap_max_results = 0;
+  }
+
+
   FT_LOCAL_DEF( FT_Error )
   tt_get_cmap_info( FT_CharMap    charmap,
                     TT_CMapInfo  *cmap_info )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h	2026-11-15 23:20:43.000000000 +0000
@@ -32,9 +32,11 @@
 
   typedef struct  TT_CMapRec_
   {
-    FT_CMapRec  cmap;
-    FT_Byte*    data;           /* pointer to in-memory cmap table */
-    FT_Int      flags;          /* for format 4 only               */
+    FT_CMapRec     cmap;
+    FT_Byte*       data;        /* pointer to in-memory cmap table */
+    FT_Int         flags;       /* for format 4 only               */
+    FT_CMap_Class  cmap_class;  /* class before applying 'DMAP'    */
+    FT_CMap        dmap;        /* overriding 'DMAP' subtable      */
 
   } TT_CMapRec, *TT_CMap;
 
@@ -112,6 +114,12 @@
   FT_LOCAL( FT_Error )
   tt_face_build_cmaps( TT_Face  face );
 
+  FT_LOCAL( FT_Error )
+  tt_face_build_dmaps( TT_Face  face );
+
+  FT_LOCAL( void )
+  tt_face_done_dmaps( TT_Face  face );
+
   /* used in tt-cmaps service */
   FT_LOCAL( FT_Error )
   tt_get_cmap_info( FT_CharMap    charmap,
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h	2026-11-15 23:20:43.000000000 +0000
@@ -52,5 +52,9 @@
   TTCMAPCITEM( tt_cmap14_class_rec )
 #endif
 
+#ifdef TT_CONFIG_CMAP_FORMAT_15
+  TTCMAPCITEM( tt_cmap15_class_rec )
+#endif
+
 
   /* END */
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c	2026-11-15 23:20:43.000000000 +0000
@@ -85,6 +85,7 @@
     FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW                 = 29,
     FT_COLR_PAINTFORMAT_INTERNAL_SKEW_CENTER              = 30,
     FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER          = 31,
+    FT_COLR_PAINTFORMAT_INTERNAL_GLYPH2                   = 33,
 
   } FT_PaintFormat_Internal;
 
@@ -645,7 +646,9 @@
 
     apaint->format = (FT_PaintFormat)FT_NEXT_BYTE( p );
 
-    if ( apaint->format >= FT_COLR_PAINT_FORMAT_MAX )
+    if ( apaint->format >= FT_COLR_PAINT_FORMAT_MAX &&
+         (FT_PaintFormat_Internal)apaint->format !=
+           FT_COLR_PAINTFORMAT_INTERNAL_GLYPH2      )
       return 0;
 
     if ( apaint->format == FT_COLR_PAINTFORMAT_COLR_LAYERS )
@@ -879,12 +882,21 @@
       return 1;
     }
 
-    if ( apaint->format == FT_COLR_PAINTFORMAT_GLYPH )
+    if ( apaint->format == FT_COLR_PAINTFORMAT_GLYPH ||
+         (FT_PaintFormat_Internal)apaint->format ==
+           FT_COLR_PAINTFORMAT_INTERNAL_GLYPH2       )
     {
-      ENSURE_READ_BYTES( 2 );
+      FT_Bool  is_glyph2 = (FT_PaintFormat_Internal)apaint->format ==
+                             FT_COLR_PAINTFORMAT_INTERNAL_GLYPH2;
+
+
+      ENSURE_READ_BYTES( ( is_glyph2 ? 3 : 2 ) );
       apaint->u.glyph.paint.p                     = child_table_p;
       apaint->u.glyph.paint.insert_root_transform = 0;
-      apaint->u.glyph.glyphID                     = FT_NEXT_USHORT( p );
+      apaint->u.glyph.glyphID = is_glyph2 ? FT_NEXT_UOFF3( p )
+                                          : FT_NEXT_USHORT( p );
+
+      apaint->format = FT_COLR_PAINTFORMAT_GLYPH;
 
       return 1;
     }
@@ -1862,39 +1874,78 @@
       alpha = face->palette[color_index].alpha;
     }
 
-    /* XXX Convert if srcSlot.bitmap is not grey? */
     src = srcSlot->bitmap.buffer;
     dst = dstSlot->bitmap.buffer +
           dstSlot->bitmap.pitch * ( dstSlot->bitmap_top - srcSlot->bitmap_top ) +
           4 * ( srcSlot->bitmap_left - dstSlot->bitmap_left );
 
-    for ( y = 0; y < srcSlot->bitmap.rows; y++ )
+    switch ( srcSlot->bitmap.pixel_mode )
     {
-      for ( x = 0; x < srcSlot->bitmap.width; x++ )
-      {
-        int  aa = src[x];
-        int  fa = alpha * aa / 255;
+      case FT_PIXEL_MODE_GRAY:
+        for ( y = 0; y < srcSlot->bitmap.rows; y++ )
+        {
+          for ( x = 0; x < srcSlot->bitmap.width; x++ )
+          {
+            int  aa = src[x];
+            int  fa = alpha * aa / 255;
 
-        int  fb = b * fa / 255;
-        int  fg = g * fa / 255;
-        int  fr = r * fa / 255;
+            int  fb = b * fa / 255;
+            int  fg = g * fa / 255;
+            int  fr = r * fa / 255;
+
+            int  ba2 = 255 - fa;
+
+            int  bb = dst[4 * x + 0];
+            int  bg = dst[4 * x + 1];
+            int  br = dst[4 * x + 2];
+            int  ba = dst[4 * x + 3];
+
+            dst[4 * x + 0] = (FT_Byte)( bb * ba2 / 255 + fb );
+            dst[4 * x + 1] = (FT_Byte)( bg * ba2 / 255 + fg );
+            dst[4 * x + 2] = (FT_Byte)( br * ba2 / 255 + fr );
+            dst[4 * x + 3] = (FT_Byte)( ba * ba2 / 255 + fa );
+          }
 
-        int  ba2 = 255 - fa;
+          src += srcSlot->bitmap.pitch;
+          dst += dstSlot->bitmap.pitch;
+        }
+        break;
 
-        int  bb = dst[4 * x + 0];
-        int  bg = dst[4 * x + 1];
-        int  br = dst[4 * x + 2];
-        int  ba = dst[4 * x + 3];
+      case FT_PIXEL_MODE_MONO:
+        {
+          int  fb = b * alpha / 255;
+          int  fg = g * alpha / 255;
+          int  fr = r * alpha / 255;
 
+          int  ba2 = 255 - alpha;
 
-        dst[4 * x + 0] = (FT_Byte)( bb * ba2 / 255 + fb );
-        dst[4 * x + 1] = (FT_Byte)( bg * ba2 / 255 + fg );
-        dst[4 * x + 2] = (FT_Byte)( br * ba2 / 255 + fr );
-        dst[4 * x + 3] = (FT_Byte)( ba * ba2 / 255 + fa );
-      }
+          for ( y = 0; y < srcSlot->bitmap.rows; y++ )
+          {
+            for ( x = 0; x < srcSlot->bitmap.width; x++ )
+            {
+              if ( src[x >> 3] & ( 0x80 >> ( x & 7 ) ) )
+              {
+                int  bb = dst[4 * x + 0];
+                int  bg = dst[4 * x + 1];
+                int  br = dst[4 * x + 2];
+                int  ba = dst[4 * x + 3];
+
+                dst[4 * x + 0] = (FT_Byte)( bb * ba2 / 255 + fb );
+                dst[4 * x + 1] = (FT_Byte)( bg * ba2 / 255 + fg );
+                dst[4 * x + 2] = (FT_Byte)( br * ba2 / 255 + fr );
+                dst[4 * x + 3] = (FT_Byte)( ba * ba2 / 255 + alpha );
+              }
+            }
+
+            src += srcSlot->bitmap.pitch;
+            dst += dstSlot->bitmap.pitch;
+          }
+        }
+        break;
 
-      src += srcSlot->bitmap.pitch;
-      dst += dstSlot->bitmap.pitch;
+      default:
+        /* Reject pixel modes other than GRAY/MONO. */
+        return FT_Err_Invalid_Glyph_Format;
     }
 
     return FT_Err_Ok;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c	2026-11-15 23:20:43.000000000 +0000
@@ -227,7 +227,9 @@
         /* ignore in general).                                            */
 
         if ( table.Tag == TTAG_hmtx ||
-             table.Tag == TTAG_vmtx )
+             table.Tag == TTAG_HMTX ||
+             table.Tag == TTAG_vmtx ||
+             table.Tag == TTAG_VMTX )
           valid_entries++;
         else
         {
@@ -439,7 +441,9 @@
       else if ( entry.Length > stream->size - entry.Offset )
       {
         if ( entry.Tag == TTAG_hmtx ||
-             entry.Tag == TTAG_vmtx )
+             entry.Tag == TTAG_HMTX ||
+             entry.Tag == TTAG_vmtx ||
+             entry.Tag == TTAG_VMTX )
         {
 #ifdef FT_DEBUG_LEVEL_TRACE
           FT_ULong  old_length = entry.Length;
@@ -749,7 +753,8 @@
                      FT_Stream  stream )
   {
     FT_Error        error;
-    TT_MaxProfile*  maxProfile = &face->max_profile;
+    TT_MaxProfile*  maxProfile  = &face->max_profile;
+    FT_Bool         is_extended = FALSE;
 
     static const FT_Frame_Field  maxp_fields[] =
     {
@@ -782,12 +787,37 @@
     };
 
 
-    error = face->goto_table( face, TTAG_maxp, stream, 0 );
+    face->maxp_num_glyphs = 0;
+
+    error = face->goto_table( face, TTAG_MAXP, stream, 0 );
+    if ( !error )
+      is_extended = TRUE;
+    else if ( FT_ERR_EQ( error, Table_Missing ) )
+      error = face->goto_table( face, TTAG_maxp, stream, 0 );
+
     if ( error )
       goto Exit;
 
-    if ( FT_STREAM_READ_FIELDS( maxp_fields, maxProfile ) )
-      goto Exit;
+    if ( is_extended )
+    {
+      FT_UInt32  num_glyphs;
+
+
+      if ( FT_READ_LONG( maxProfile->version ) ||
+           FT_READ_UOFF3( num_glyphs )         )
+        goto Exit;
+
+      face->maxp_num_glyphs = num_glyphs;
+      maxProfile->numGlyphs = num_glyphs > 0xFFFFU ? 0xFFFFU
+                                                   : (FT_UShort)num_glyphs;
+    }
+    else
+    {
+      if ( FT_STREAM_READ_FIELDS( maxp_fields, maxProfile ) )
+        goto Exit;
+
+      face->maxp_num_glyphs = maxProfile->numGlyphs;
+    }
 
     maxProfile->maxPoints             = 0;
     maxProfile->maxContours           = 0;
@@ -829,7 +859,7 @@
       }
     }
 
-    FT_TRACE3(( "numGlyphs: %hu\n", maxProfile->numGlyphs ));
+    FT_TRACE3(( "numGlyphs: %u\n", face->maxp_num_glyphs ));
 
   Exit:
     return error;
@@ -1135,6 +1165,21 @@
     if ( FT_FRAME_EXTRACT( face->cmap_size, face->cmap_table ) )
       face->cmap_size = 0;
 
+    if ( error )
+      goto Exit;
+
+    error = face->goto_table( face, TTAG_DMAP, stream, &face->dmap_size );
+    if ( error )
+    {
+      face->dmap_size = 0;
+      if ( FT_ERR_EQ( error, Table_Missing ) )
+        error = FT_Err_Ok;
+      goto Exit;
+    }
+
+    if ( FT_FRAME_EXTRACT( face->dmap_size, face->dmap_table ) )
+      face->dmap_size = 0;
+
   Exit:
     return error;
   }
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c	2026-11-15 23:20:43.000000000 +0000
@@ -81,13 +81,15 @@
 
     if ( vertical )
     {
-      tag           = TTAG_vmtx;
+      tag           = face->vert_metrics_is_extended ? TTAG_VMTX
+                                                     : TTAG_vmtx;
       ptable_offset = &face->vert_metrics_offset;
       ptable_size   = &face->vert_metrics_size;
     }
     else
     {
-      tag           = TTAG_hmtx;
+      tag           = face->horz_metrics_is_extended ? TTAG_HMTX
+                                                     : TTAG_hmtx;
       ptable_offset = &face->horz_metrics_offset;
       ptable_size   = &face->horz_metrics_size;
     }
@@ -132,13 +134,17 @@
   {
     FT_Error        error;
     TT_HoriHeader*  header;
+    FT_UInt32*      metrics_count;
+    FT_Bool*        is_extended;
+    FT_ULong        lower_tag;
+    FT_ULong        upper_tag;
 
     static const FT_Frame_Field  metrics_header_fields[] =
     {
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  TT_HoriHeader
 
-      FT_FRAME_START( 36 ),
+      FT_FRAME_START( 34 ),
         FT_FRAME_ULONG ( Version ),
         FT_FRAME_SHORT ( Ascender ),
         FT_FRAME_SHORT ( Descender ),
@@ -155,7 +161,6 @@
         FT_FRAME_SHORT ( Reserved[2] ),
         FT_FRAME_SHORT ( Reserved[3] ),
         FT_FRAME_SHORT ( metric_Data_Format ),
-        FT_FRAME_USHORT( number_Of_HMetrics ),
       FT_FRAME_END
     };
 
@@ -165,27 +170,71 @@
       void  *v = &face->vertical;
 
 
-      error = face->goto_table( face, TTAG_vhea, stream, 0 );
+      header        = (TT_HoriHeader*)v;
+      metrics_count = &face->vert_metrics_count;
+      is_extended   = &face->vert_metrics_is_extended;
+      lower_tag     = TTAG_vhea;
+      upper_tag     = TTAG_VHEA;
+    }
+    else
+    {
+      header        = &face->horizontal;
+      metrics_count = &face->horz_metrics_count;
+      is_extended   = &face->horz_metrics_is_extended;
+      lower_tag     = TTAG_hhea;
+      upper_tag     = TTAG_HHEA;
+    }
+
+    *metrics_count = 0;
+    *is_extended   = FALSE;
+
+    if ( face->is_extended_glyf )
+    {
+      error = face->goto_table( face, upper_tag, stream, 0 );
       if ( error )
         goto Fail;
 
-      header = (TT_HoriHeader*)v;
+      *is_extended = TRUE;
     }
     else
     {
-      error = face->goto_table( face, TTAG_hhea, stream, 0 );
+      error = face->goto_table( face, lower_tag, stream, 0 );
+      if ( FT_ERR_EQ( error, Table_Missing ) )
+      {
+        error = face->goto_table( face, upper_tag, stream, 0 );
+        if ( !error )
+          *is_extended = TRUE;
+      }
       if ( error )
         goto Fail;
-
-      header = &face->horizontal;
     }
 
     if ( FT_STREAM_READ_FIELDS( metrics_header_fields, header ) )
       goto Fail;
 
+    if ( *is_extended )
+    {
+      if ( FT_READ_ULONG( *metrics_count ) )
+        goto Fail;
+    }
+    else
+    {
+      FT_UShort  count;
+
+
+      if ( FT_READ_USHORT( count ) )
+        goto Fail;
+
+      *metrics_count = count;
+    }
+
+    header->number_Of_HMetrics = *metrics_count > 0xFFFFU
+                                   ? 0xFFFFU
+                                   : (FT_UShort)*metrics_count;
+
     FT_TRACE3(( "Ascender:          %5d\n", header->Ascender ));
     FT_TRACE3(( "Descender:         %5d\n", header->Descender ));
-    FT_TRACE3(( "number_Of_Metrics: %5u\n", header->number_Of_HMetrics ));
+    FT_TRACE3(( "number_Of_Metrics: %5lu\n", (FT_ULong)*metrics_count ));
 
     header->long_metrics  = NULL;
     header->short_metrics = NULL;
@@ -231,11 +280,10 @@
                        FT_Short   *abearing,
                        FT_UShort  *aadvance )
   {
-    FT_Error        error;
-    FT_Stream       stream = face->root.stream;
-    TT_HoriHeader*  header;
-    FT_ULong        table_pos, table_size, table_end;
-    FT_UShort       k;
+    FT_Error   error;
+    FT_Stream  stream = face->root.stream;
+    FT_ULong   table_pos, table_size, table_end;
+    FT_UInt32  k;
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
     FT_Service_MetricsVariations  var =
@@ -245,24 +293,19 @@
 
     if ( vertical )
     {
-      void*  v = &face->vertical;
-
-
-      header     = (TT_HoriHeader*)v;
       table_pos  = face->vert_metrics_offset;
       table_size = face->vert_metrics_size;
+      k          = face->vert_metrics_count;
     }
     else
     {
-      header     = &face->horizontal;
       table_pos  = face->horz_metrics_offset;
       table_size = face->horz_metrics_size;
+      k          = face->horz_metrics_count;
     }
 
     table_end = table_pos + table_size;
 
-    k = header->number_Of_HMetrics;
-
     if ( k > 0 )
     {
       if ( gindex < (FT_UInt)k )
@@ -306,7 +349,9 @@
     }
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-    if ( var && FT_IS_VARIATION( &face->root ) )
+    if ( var                                     &&
+         ( FT_IS_VARIATION( &face->root )      ||
+           FT_IS_NAMED_INSTANCE( &face->root ) ) )
     {
       FT_Face  f = FT_FACE( face );
       FT_Int   a = (FT_Int)*aadvance;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c	2026-11-15 23:20:43.000000000 +0000
@@ -337,10 +337,10 @@
 
     /* UNDOCUMENTED!  The number of glyphs in this table can be smaller */
     /* than the value in the maxp table (cf. cyberbit.ttf).             */
-    if ( post_len < 34                            ||
-         FT_STREAM_SKIP( 32 )                     ||
-         FT_READ_USHORT( num_glyphs )             ||
-         num_glyphs > face->max_profile.numGlyphs ||
+    if ( post_len < 34                      ||
+         FT_STREAM_SKIP( 32 )               ||
+         FT_READ_USHORT( num_glyphs )       ||
+         num_glyphs > face->maxp_num_glyphs ||
          num_glyphs == 0 )
       goto Exit;
 
@@ -422,7 +422,7 @@
     if ( !face )
       return FT_THROW( Invalid_Face_Handle );
 
-    if ( idx >= (FT_UInt)face->max_profile.numGlyphs )
+    if ( idx >= face->maxp_num_glyphs )
       return FT_THROW( Invalid_Glyph_Index );
 
 #ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
@@ -463,7 +463,7 @@
 
     /* version 1.0 is only valid with 258 glyphs */
     else if ( format == 0x00010000L              &&
-              face->max_profile.numGlyphs == 258 )
+              face->maxp_num_glyphs == 258 )
       *PSname = MAC_NAME( idx );
 
     /* nothing to do for format == 0x00030000L */
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c	2026-11-15 23:20:43.000000000 +0000
@@ -1602,9 +1602,10 @@
       metrics->horiBearingY = (FT_Short)( originOffsetY + metrics->height );
       metrics->vertBearingY = (FT_Short)originOffsetY;
 
-      metrics->horiAdvance  = (FT_UShort)( aadvance *
-                                           face->root.size->metrics.x_ppem /
-                                           face->header.Units_Per_EM );
+      metrics->horiAdvance =
+        (FT_UShort)FT_MulDiv( aadvance,
+                              face->root.size->metrics.x_ppem,
+                              face->header.Units_Per_EM );
 
       if ( face->vertical_info )
         tt_face_get_metrics( face, TRUE, glyph_index, &abearing, &aadvance );
@@ -1615,9 +1616,10 @@
         aadvance = (FT_UShort)FT_ABS( face->horizontal.Ascender -
                                       face->horizontal.Descender );
 
-      metrics->vertAdvance  = (FT_UShort)( aadvance *
-                                           face->root.size->metrics.x_ppem /
-                                           face->header.Units_Per_EM );
+      metrics->vertAdvance =
+        (FT_UShort)FT_MulDiv( aadvance,
+                              face->root.size->metrics.x_ppem,
+                              face->header.Units_Per_EM );
     }
 
     return error;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c	2026-11-15 23:20:43.000000000 +0000
@@ -68,11 +68,14 @@
    *
    * This renderer has the following advantages:
    *
-   * - It doesn't need an intermediate bitmap.  Instead, one can supply a
-   *   callback function that will be called by the renderer to draw gray
-   *   spans on any target surface.  You can thus do direct composition on
-   *   any kind of bitmap, provided that you give the renderer the right
-   *   callback.
+   * - It doesn't need an intermediate bitmap.  Instead,  linked lists
+   *   of cells (pixels visited by an outline) are stored, which requires
+   *   less memory and can be maintained on the stack for small glyphs.
+   *
+   * - One can supply a callback function that will be called by the
+   *   renderer to draw gray spans on any target surface.  You can thus
+   *   do direct composition on any kind of bitmap, provided that you give
+   *   the renderer the right callback.
    *
    * - A perfect anti-aliaser, i.e., it computes the _exact_ coverage on
    *   each pixel cell by straight segments.
@@ -464,7 +467,10 @@
 
   } TPixmap;
 
-  /* maximum number of gray cells in the buffer */
+  /* Maximum number of gray cells in the stack buffer;  */
+  /* for example, a buffer of 680 cells can accommodate */
+  /* a glyph with the taxicab perimeter of 680 pixels.  */
+  /* A larger buffer can be allocated when necessary.   */
 #if FT_RENDER_POOL_SIZE > 2048
 #define FT_MAX_GRAY_POOL  ( FT_RENDER_POOL_SIZE / sizeof ( TCell ) )
 #else
@@ -485,16 +491,14 @@
 
   typedef struct  gray_TWorker_
   {
-    FT_BBox     cbox;
-
-    TCoord  min_ex, max_ex;  /* min and max integer pixel coordinates */
-    TCoord  min_ey, max_ey;
-    TCoord  count_ey;        /* same as (max_ey - min_ey) */
+    TCoord  min_ex, min_ey;  /* min and max integer pixel coordinates */
+    TCoord  max_ex, max_ey;
 
     int         error;       /* pool overflow exception                  */
+    PCell       buffer;      /* buffer                                   */
+    PCell       cell_null;   /* last cell, used as dumpster and limit    */
     PCell       cell;        /* current cell                             */
     PCell       cell_free;   /* call allocation next free slot           */
-    PCell       cell_null;   /* last cell, used as dumpster and limit    */
 
     PCell*      ycells;      /* array of cell linked-lists; one per      */
                              /* vertical coordinate in the current band  */
@@ -581,14 +585,11 @@
     /* Note that if a cell is to the left of the clipping region, it is    */
     /* actually set to the (min_ex-1) horizontal position.                 */
 
-    TCoord  ey_index = ey - ras.min_ey;
-
-
-    if ( ey_index < 0 || ey_index >= ras.count_ey || ex >= ras.max_ex )
+    if ( ey < ras.min_ey || ey >= ras.max_ey || ex >= ras.max_ex )
       ras.cell = ras.cell_null;
     else
     {
-      PCell*  pcell = ras.ycells + ey_index;
+      PCell*  pcell = ras.ycells + ( ey - ras.min_ey );
       PCell   cell;
 
 
@@ -1502,15 +1503,14 @@
       tags  = outline->tags   + first;
       tag   = FT_CURVE_TAG( tags[0] );
 
-      /* A contour cannot start with a cubic control point! */
-      if ( tag == FT_CURVE_TAG_CUBIC )
-        goto Invalid_Outline;
-
       /* check first point to determine origin */
-      if ( tag == FT_CURVE_TAG_CONIC )
+      if ( tag != FT_CURVE_TAG_ON )
       {
-        /* first point is conic control.  Yes, this happens. */
-        if ( FT_CURVE_TAG( outline->tags[last] ) == FT_CURVE_TAG_ON )
+        char  last_tag = FT_CURVE_TAG( outline->tags[last] );
+
+
+        /* first point is a control point.  Yes, this happens. */
+        if ( last_tag == FT_CURVE_TAG_ON )
         {
           /* start at last point if it is on the curve */
           v_start = v_last;
@@ -1518,9 +1518,12 @@
         }
         else
         {
-          /* if both first and last points are conic,         */
-          /* start at their middle and record its position    */
-          /* for closure                                      */
+          if ( last_tag != tag )
+            goto Invalid_Outline;
+
+          /* if both first and last points are controls,   */
+          /* start at their middle and record its position */
+          /* for closure                                   */
           v_start.x = ( v_start.x + v_last.x ) / 2;
           v_start.y = ( v_start.y + v_last.y ) / 2;
 
@@ -1636,11 +1639,24 @@
             if ( point <= limit )
             {
               FT_Vector  vec;
+              FT_Vector  v_middle;
+
 
+              tag = FT_CURVE_TAG( tags[0] );
 
               vec.x = SCALED( point->x );
               vec.y = SCALED( point->y );
 
+              if ( tag == FT_CURVE_TAG_CUBIC )
+              {
+                v_middle.x = ( vec2.x + vec.x ) / 2;
+                v_middle.y = ( vec2.y + vec.y ) / 2;
+
+                vec = v_middle;
+              }
+              else if ( tag != FT_CURVE_TAG_ON )
+                goto Invalid_Outline;
+
               FT_TRACE5(( "  cubic to (%.2f, %.2f)"
                           " with controls (%.2f, %.2f) and (%.2f, %.2f)\n",
                           vec.x / 64.0, vec.y / 64.0,
@@ -1649,6 +1665,12 @@
               error = func_interface->cubic_to( &vec1, &vec2, &vec, user );
               if ( error )
                 goto Exit;
+
+              if ( tag == FT_CURVE_TAG_CUBIC )
+              {
+                point--;
+                tags--;
+              }
               continue;
             }
 
@@ -1804,7 +1826,7 @@
           FT_FILL_RULE( coverage, cover, fill );
 
           span[n].coverage = (unsigned char)coverage;
-          span[n].x        = (unsigned short)x;
+          span[n].x        = (short)x;
           span[n].len      = (unsigned short)( cell->x - x );
 
           if ( ++n == FT_MAX_GRAY_SPANS )
@@ -1823,7 +1845,7 @@
           FT_FILL_RULE( coverage, area, fill );
 
           span[n].coverage = (unsigned char)coverage;
-          span[n].x        = (unsigned short)cell->x;
+          span[n].x        = (short)cell->x;
           span[n].len      = 1;
 
           if ( ++n == FT_MAX_GRAY_SPANS )
@@ -1861,101 +1883,75 @@
   static int
   gray_convert_glyph( RAS_ARG )
   {
-    TCell    buffer[FT_MAX_GRAY_POOL];
-    size_t   height = (size_t)( ras.cbox.yMax - ras.cbox.yMin );
-    size_t   n = FT_MAX_GRAY_POOL / 8;
-    TCoord   y;
     TCoord   bands[32];  /* enough to accommodate bisections */
-    TCoord*  band;
+    TCoord*  band = bands;
 
     int  continued = 0;
     int  error     = Smooth_Err_Ok;
 
 
     /* Initialize the null cell at the end of the poll. */
-    ras.cell_null        = buffer + FT_MAX_GRAY_POOL - 1;
     ras.cell_null->x     = CELL_MAX_X_VALUE;
     ras.cell_null->area  = 0;
     ras.cell_null->cover = 0;
     ras.cell_null->next  = NULL;
 
     /* set up vertical bands */
-    ras.ycells     = (PCell*)buffer;
-
-    if ( height > n )
-    {
-      /* two divisions rounded up */
-      n       = ( height + n - 1 ) / n;
-      height  = ( height + n - 1 ) / n;
-    }
+    ras.ycells = (PCell*)ras.buffer;
 
-    for ( y = ras.cbox.yMin; y < ras.cbox.yMax; )
+    while ( 1 )
     {
-      ras.min_ey = y;
-      y         += height;
-      ras.max_ey = FT_MIN( y, ras.cbox.yMax );
-
-      ras.count_ey = ras.max_ey - ras.min_ey;
-
-      band    = bands;
-      band[1] = ras.cbox.xMin;
-      band[0] = ras.cbox.xMax;
+      size_t  n;
+      TCoord  i, count = ras.max_ey - ras.min_ey;
 
-      do
-      {
-        TCoord  i;
 
+      /* memory management: zero out and skip ycells */
+      for ( i = 0; i < count; ++i )
+        ras.ycells[i] = ras.cell_null;
 
-        ras.min_ex = band[1];
-        ras.max_ex = band[0];
+      n = ( (size_t)count * sizeof ( PCell ) + sizeof ( TCell ) - 1 )
+            / sizeof ( TCell );
 
-        /* memory management: zero out and skip ycells */
-        for ( i = 0; i < ras.count_ey; ++i )
-          ras.ycells[i] = ras.cell_null;
+      ras.cell_free = ras.buffer + n;
+      ras.cell      = ras.cell_null;
+      ras.error     = Smooth_Err_Ok;
 
-        n = ( (size_t)ras.count_ey * sizeof ( PCell ) + sizeof ( TCell ) - 1 )
-              / sizeof ( TCell );
+      error     = gray_convert_glyph_inner( RAS_VAR_ continued );
+      continued = 1;
 
-        ras.cell_free = buffer + n;
-        ras.cell      = ras.cell_null;
-        ras.error     = Smooth_Err_Ok;
+      if ( !error )
+      {
+        if ( ras.render_span )  /* for FT_RASTER_FLAG_DIRECT only */
+          gray_sweep_direct( RAS_VAR );
+        else
+          gray_sweep( RAS_VAR );
 
-        error     = gray_convert_glyph_inner( RAS_VAR_ continued );
-        continued = 1;
+        if ( band == bands )
+          break;  /* done */
 
-        if ( !error )
-        {
-          if ( ras.render_span )  /* for FT_RASTER_FLAG_DIRECT only */
-            gray_sweep_direct( RAS_VAR );
-          else
-            gray_sweep( RAS_VAR );
-          band--;
-          continue;
-        }
-        else if ( error != Smooth_Err_Raster_Overflow )
-          goto Exit;
+        ras.max_ey = ras.min_ey;
+        ras.min_ey = *--band;
+        continue;
+      }
+      else if ( error != Smooth_Err_Raster_Overflow )
+        goto Exit;
 
-        /* render pool overflow; we will reduce the render band by half */
-        i = ( band[0] - band[1] ) >> 1;
+      /* render pool overflow, reduce the render band by half */
+      count >>= 1;
 
-        /* this should never happen even with tiny rendering pool */
-        if ( i == 0 )
-        {
-          FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
-          error = FT_THROW( Raster_Overflow );
-          goto Exit;
-        }
+      /* this happens only if the rendering pool is too small */
+      if ( count == 0 )
+      {
+        FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
+        error = FT_THROW( Raster_Overflow );
+        goto Exit;
+      }
 
-        band++;
-        band[1]  = band[0];
-        band[0] += i;
-      } while ( band >= bands );
+      *band++     = ras.min_ey;
+      ras.min_ey += count;
     }
 
   Exit:
-    ras.cell   = ras.cell_free = ras.cell_null = NULL;
-    ras.ycells = NULL;
-
     return error;
   }
 
@@ -1964,6 +1960,9 @@
   gray_raster_render( FT_Raster                raster,
                       const FT_Raster_Params*  params )
   {
+    FT_ULong  estimate;
+    int       ret;
+
     const FT_Outline*  outline    = (const FT_Outline*)params->source;
     const FT_Bitmap*   target_map = params->target;
 
@@ -2003,7 +2002,10 @@
       ras.render_span      = (FT_Raster_Span_Func)params->gray_spans;
       ras.render_span_data = params->user;
 
-      ras.cbox = params->clip_box;
+      ras.min_ex = (TCoord)params->clip_box.xMin;
+      ras.min_ey = (TCoord)params->clip_box.yMin;
+      ras.max_ex = (TCoord)params->clip_box.xMax;
+      ras.max_ey = (TCoord)params->clip_box.yMax;
     }
     else
     {
@@ -2029,17 +2031,45 @@
       ras.render_span      = (FT_Raster_Span_Func)NULL;
       ras.render_span_data = NULL;
 
-      ras.cbox.xMin = 0;
-      ras.cbox.yMin = 0;
-      ras.cbox.xMax = (FT_Pos)target_map->width;
-      ras.cbox.yMax = (FT_Pos)target_map->rows;
+      ras.min_ex = 0;
+      ras.min_ey = 0;
+      ras.max_ex = (TCoord)target_map->width;
+      ras.max_ey = (TCoord)target_map->rows;
     }
 
     /* exit if nothing to do */
-    if ( ras.cbox.xMin >= ras.cbox.xMax || ras.cbox.yMin >= ras.cbox.yMax )
+    if ( ras.min_ex >= ras.max_ex || ras.min_ey >= ras.max_ey )
       return Smooth_Err_Ok;
 
-    return gray_convert_glyph( RAS_VAR );
+    /* allocate memory based on empirical estimate from CJK fonts */
+    estimate = ( ras.max_ex - ras.min_ex + ras.max_ey - ras.min_ey ) * 10UL;
+    if ( estimate > FT_MAX_GRAY_POOL )
+    {
+      FT_Error   error;
+      FT_Memory  memory = (FT_Memory)((gray_PRaster)raster)->memory;
+
+
+      if ( FT_QNEW_ARRAY( ras.buffer, estimate ) )
+        ret = error;
+      else
+      {
+        ras.cell_null = ras.buffer + estimate - 1;
+        ret = gray_convert_glyph( RAS_VAR );
+        FT_FREE( ras.buffer );
+      }
+    }
+    else
+    {
+      TCell  buffer[FT_MAX_GRAY_POOL];  /* stack allocation */
+
+
+      ras.buffer    = buffer;
+      ras.cell_null = ras.buffer + FT_MAX_GRAY_POOL - 1;
+
+      ret = gray_convert_glyph( RAS_VAR );
+    }
+
+    return ret;
   }
 
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c	2026-11-15 23:20:43.000000000 +0000
@@ -124,7 +124,8 @@
 
 
     for ( ; count--; spans++ )
-      for ( dst = dst_line + spans->x * 3, w = spans->len; w--; dst += 3 )
+      for ( dst = dst_line + (unsigned short)spans->x * 3,
+            w = spans->len; w--; dst += 3 )
         *dst = spans->coverage;
   }
 
@@ -151,7 +152,7 @@
 
     params.clip_box.xMin = 0;
     params.clip_box.yMin = 0;
-    params.clip_box.xMax = bitmap->width;
+    params.clip_box.xMax = bitmap->width / 3;
     params.clip_box.yMax = bitmap->rows;
 
     if ( bitmap->pitch < 0 )
@@ -290,7 +291,8 @@
 
 
     for ( ; count--; spans++ )
-      for ( dst = dst_line + spans->x, w = spans->len; w--; dst++ )
+      for ( dst = dst_line + (unsigned short)spans->x,
+            w = spans->len; w--; dst++ )
       {
         dst[0] += ( spans->coverage * target->wght[0] + 85 ) >> 8;
         dst[1] += ( spans->coverage * target->wght[1] + 85 ) >> 8;
@@ -385,7 +387,8 @@
 
 
     for ( ; count--; spans++ )
-      for ( dst = dst_line + spans->x, w = spans->len; w--; dst++ )
+      for ( dst = dst_line + (unsigned short)spans->x,
+            w = spans->len; w--; dst++ )
       {
         dst[        0] += ( spans->coverage * target->wght[0] + 85 ) >> 8;
         dst[    pitch] += ( spans->coverage * target->wght[1] + 85 ) >> 8;
@@ -473,7 +476,7 @@
 
 
     unsigned char*  dst = target->origin - ( y / SCALE ) * target->pitch;
-    unsigned short  x;
+    unsigned int    x, i;
     unsigned int    cover, sum;
 
 
@@ -487,8 +490,9 @@
       cover = ( spans->coverage + SCALE * SCALE / 2 ) / ( SCALE * SCALE );
       for ( x = 0; x < spans->len; x++ )
       {
-        sum                           = dst[( spans->x + x ) / SCALE] + cover;
-        dst[( spans->x + x ) / SCALE] = (unsigned char)( sum - ( sum >> 8 ) );
+        i      = ( (unsigned short)spans->x + x ) / SCALE;
+        sum    = dst[i] + cover;
+        dst[i] = (unsigned char)( sum - ( sum >> 8 ) );
       }
     }
   }
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c	2026-11-15 23:20:43.000000000 +0000
@@ -32,6 +32,10 @@
 #include 
 #include 
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include 
+#endif
+
 #include "ttdriver.h"
 #include "ttgload.h"
 #include "ttpload.h"
@@ -40,6 +44,10 @@
 #include "ttgxvar.h"
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include "ttvarc.h"
+#endif
+
 #include "tterrors.h"
 
 
@@ -456,15 +464,6 @@
     FT_Error      error;
 
 
-    if ( !slot )
-      return FT_THROW( Invalid_Slot_Handle );
-
-    if ( !size )
-      return FT_THROW( Invalid_Size_Handle );
-
-    if ( !face )
-      return FT_THROW( Invalid_Face_Handle );
-
 #ifdef FT_CONFIG_OPTION_INCREMENTAL
     if ( glyph_index >= (FT_UInt)face->num_glyphs &&
          !face->internal->incremental_interface   )
@@ -493,6 +492,39 @@
         load_flags |= FT_LOAD_NO_HINTING;
     }
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+    /*
+     * DirectWrite treats ClearType symmetric grid fitting independently
+     * from symmetric smoothing.  Resolve the grid-fitting decision from the
+     * same policy source that GETINFO uses for symmetric smoothing.
+     *
+     * Only native v40 horizontal-LCD hinting participates.  Caller-disabled
+     * native hinting and the other interpreter/rendering modes are left
+     * alone.
+     */
+    if ( FT_LOAD_TARGET_MODE( load_flags ) == FT_RENDER_MODE_LCD &&
+         !( load_flags & FT_LOAD_NO_HINTING )                    &&
+         !FT_IS_TRICKY( face )                                   )
+    {
+      TT_Driver  driver = (TT_Driver)FT_FACE_DRIVER( face );
+
+
+      if ( driver->interpreter_version == TT_INTERPRETER_VERSION_40 )
+      {
+        FT_Bool  grid_fit;
+
+
+        tt_face_get_cleartype_policy( (TT_Face)face,
+                                      size->metrics.y_ppem,
+                                      NULL,
+                                      &grid_fit );
+
+        if ( !grid_fit )
+          load_flags |= FT_LOAD_NO_HINTING;
+      }
+    }
+#endif
+
     /* use hinted metrics only if we load a glyph with hinting */
     ttsize->metrics = ( load_flags & FT_LOAD_NO_HINTING )
                         ? &size->metrics
@@ -571,6 +603,21 @@
 #endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */
 
 
+#ifdef TT_CONFIG_OPTION_VARC
+
+  FT_DEFINE_SERVICE_VARCREC(
+    tt_service_varc,
+
+    tt_face_init_varc_axes,
+    tt_face_load_varc,
+    tt_face_free_varc,
+    tt_face_has_varc_glyph,
+    tt_face_load_varc_glyph
+  )
+
+#endif /* TT_CONFIG_OPTION_VARC */
+
+
   static const FT_Service_TrueTypeEngineRec  tt_service_truetype_engine =
   {
 #ifdef TT_USE_BYTECODE_INTERPRETER
@@ -592,7 +639,19 @@
   )
 
 
-#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#if defined( TT_CONFIG_OPTION_GX_VAR_SUPPORT ) && \
+    defined( TT_CONFIG_OPTION_VARC )
+  FT_DEFINE_SERVICEDESCREC7(
+    tt_services,
+
+    FT_SERVICE_ID_FONT_FORMAT,        FT_FONT_FORMAT_TRUETYPE,
+    FT_SERVICE_ID_MULTI_MASTERS,      &tt_service_gx_multi_masters,
+    FT_SERVICE_ID_METRICS_VARIATIONS, &tt_service_metrics_variations,
+    FT_SERVICE_ID_VARC,               &tt_service_varc,
+    FT_SERVICE_ID_TRUETYPE_ENGINE,    &tt_service_truetype_engine,
+    FT_SERVICE_ID_TT_GLYF,            &tt_service_truetype_glyf,
+    FT_SERVICE_ID_PROPERTIES,         &tt_service_properties )
+#elif defined( TT_CONFIG_OPTION_GX_VAR_SUPPORT )
   FT_DEFINE_SERVICEDESCREC6(
     tt_services,
 
@@ -602,6 +661,15 @@
     FT_SERVICE_ID_TRUETYPE_ENGINE,    &tt_service_truetype_engine,
     FT_SERVICE_ID_TT_GLYF,            &tt_service_truetype_glyf,
     FT_SERVICE_ID_PROPERTIES,         &tt_service_properties )
+#elif defined( TT_CONFIG_OPTION_VARC )
+  FT_DEFINE_SERVICEDESCREC5(
+    tt_services,
+
+    FT_SERVICE_ID_FONT_FORMAT,     FT_FONT_FORMAT_TRUETYPE,
+    FT_SERVICE_ID_VARC,            &tt_service_varc,
+    FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine,
+    FT_SERVICE_ID_TT_GLYF,         &tt_service_truetype_glyf,
+    FT_SERVICE_ID_PROPERTIES,      &tt_service_properties )
 #else
   FT_DEFINE_SERVICEDESCREC4(
     tt_services,
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c	2026-11-15 23:20:43.000000000 +0000
@@ -34,6 +34,10 @@
 #include "ttgxvar.h"
 #endif
 
+#ifdef TT_CONFIG_OPTION_VARC
+#include "ttvarc.h"
+#endif
+
 #include "tterrors.h"
 
 
@@ -51,7 +55,7 @@
    *
    * Simple glyph flags.
    */
-#define ON_CURVE_POINT  0x01  /* same value as FT_CURVE_TAG_ON            */
+#define ON_CURVE_POINT  0x01
 #define X_SHORT_VECTOR  0x02
 #define Y_SHORT_VECTOR  0x04
 #define REPEAT_FLAG     0x08
@@ -60,6 +64,7 @@
 #define Y_POSITIVE      0x20  /* two meanings depending on Y_SHORT_VECTOR */
 #define SAME_Y          0x20
 #define OVERLAP_SIMPLE  0x40  /* retained as FT_OUTLINE_OVERLAP           */
+#define CUBIC_FLAG      0x80
 
 
   /**************************************************************************
@@ -79,6 +84,7 @@
 #define OVERLAP_COMPOUND           0x0400  /* retained as FT_OUTLINE_OVERLAP */
 #define SCALED_COMPONENT_OFFSET    0x0800
 #define UNSCALED_COMPONENT_OFFSET  0x1000
+#define GID_IS_24_BIT              0x2000
 
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
@@ -345,8 +351,8 @@
     FT_Byte*        limit      = load->limit;
     FT_GlyphLoader  gloader    = load->gloader;
     FT_Outline*     outline    = &gloader->current.outline;
-    FT_Int          n_contours = load->n_contours;
-    FT_Int          n_points;
+    FT_UInt         n_contours = (FT_UInt)load->n_contours;
+    FT_UInt         n_points;
     FT_UShort       n_ins;
 
     FT_Byte         *flag, *flag_limit;
@@ -354,7 +360,6 @@
     FT_Vector       *vec, *vec_limit;
     FT_Pos          x, y;
     FT_UShort       *cont, *cont_limit;
-    FT_Int          last;
 
 
     /* check that we can add the contours to the glyph */
@@ -363,27 +368,25 @@
       goto Fail;
 
     /* check space for contours array + instructions count */
-    if ( n_contours >= 0xFFF || p + 2 * n_contours + 2 > limit )
+    if ( n_contours >= 0xFFFU || p + 2 * n_contours + 2 > limit )
       goto Invalid_Outline;
 
     /* reading the contours' endpoints & number of points */
     cont       = outline->contours;
     cont_limit = cont + n_contours;
 
-    last = -1;
+    n_points = 0;
     for ( ; cont < cont_limit; cont++ )
     {
       *cont = FT_NEXT_USHORT( p );
 
-      if ( *cont <= last )
+      if ( *cont < n_points )
         goto Invalid_Outline;
 
-      last = *cont;
+      n_points = *cont + 1U;
     }
 
-    n_points = last + 1;
-
-    FT_TRACE5(( "  # of points: %d\n", n_points ));
+    FT_TRACE5(( "  # of points: %u\n", n_points ));
 
     /* note that we will add four phantom points later */
     error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 );
@@ -527,8 +530,9 @@
       y     += delta;
       vec->y = y;
 
-      /* the cast is for stupid compilers */
-      *flag  = (FT_Byte)( f & ON_CURVE_POINT );
+      *flag = (FT_Byte)( f & ON_CURVE_POINT );
+      if ( load->face->is_extended_glyf && ( f & CUBIC_FLAG ) )
+        *flag |= FT_CURVE_TAG_CUBIC;
     }
 
     outline->n_points   = (FT_UShort)n_points;
@@ -570,7 +574,7 @@
       if ( error )
         goto Fail;
 
-      /* check space */
+      /* check space for the flags and a 16-bit glyph ID */
       if ( p + 4 > limit )
         goto Invalid_Composite;
 
@@ -579,7 +583,16 @@
       subglyph->arg1 = subglyph->arg2 = 0;
 
       subglyph->flags = FT_NEXT_USHORT( p );
-      subglyph->index = FT_NEXT_USHORT( p );
+      if ( loader->face->is_extended_glyf           &&
+           ( subglyph->flags & GID_IS_24_BIT ) != 0 )
+      {
+        if ( p + 3 > limit )
+          goto Invalid_Composite;
+
+        subglyph->index = (FT_Int)FT_NEXT_UOFF3( p );
+      }
+      else
+        subglyph->index = FT_NEXT_USHORT( p );
 
       /* we reject composites that have components */
       /* with invalid glyph indices                */
@@ -1148,7 +1161,15 @@
              IS_HINTED( loader->load_flags )    )
         {
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-          if ( !loader->exec->backward_compatibility )
+          TT_Driver  driver =
+                       (TT_Driver)FT_FACE_DRIVER( (FT_Face)loader->face );
+
+
+          /* v40 approximates native ClearType's fine horizontal grid by */
+          /* leaving X offsets of components unrounded.                  */
+          if ( driver->interpreter_version != TT_INTERPRETER_VERSION_40 ||
+               loader->exec->mode == FT_RENDER_MODE_MONO                ||
+               FT_IS_TRICKY( (FT_Face)loader->face )                    )
 #endif
             x = FT_PIX_ROUND( x );
 
@@ -2539,6 +2560,84 @@
 
 #endif /* FT_CONFIG_OPTION_SVG */
 
+#ifdef TT_CONFIG_OPTION_VARC
+
+    /* check for VARC glyphs */
+    if ( face->varc                                           &&
+         tt_face_has_varc_glyph( (FT_Face)face, glyph_index ) )
+    {
+      FT_TRACE3(( "Loading VARC glyph\n" ));
+
+      error = tt_face_load_varc_glyph( (FT_Face)face,
+                                       (FT_GlyphSlot)glyph,
+                                       glyph_index,
+                                       load_flags );
+      if ( !error )
+      {
+        FT_Short   left_bearing   = 0;
+        FT_Short   top_bearing    = 0;
+        FT_UShort  advance_width  = 0;
+        FT_UShort  advance_height = 0;
+
+
+        /* Get advance width and height. */
+        TT_Get_HMetrics( face, glyph_index,
+                         &left_bearing,
+                         &advance_width );
+        TT_Get_VMetrics( face, glyph_index,
+                         0,
+                         &top_bearing,
+                         &advance_height );
+
+        glyph->linearHoriAdvance = advance_width;
+        glyph->linearVertAdvance = advance_height;
+
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+        {
+          FT_Int  advance = (FT_Int)advance_width;
+
+
+          tt_hadvance_adjust( (FT_Face)face, glyph_index, &advance );
+          advance_width = (FT_UShort)advance;
+        }
+#endif
+
+        {
+          FT_BBox  bbox;
+
+
+          FT_Outline_Get_CBox( &glyph->outline, &bbox );
+
+          glyph->metrics.horiBearingX = bbox.xMin;
+          glyph->metrics.horiBearingY = bbox.yMax;
+          glyph->metrics.width        = SUB_LONG( bbox.xMax, bbox.xMin );
+          glyph->metrics.height       = SUB_LONG( bbox.yMax, bbox.yMin );
+        }
+
+        if ( load_flags & FT_LOAD_NO_SCALE )
+        {
+          /* Under NO_SCALE the advance is in font units (no 26.6 shift), */
+          /* like the normal glyf path (pp2.x - pp1.x).                   */
+          glyph->metrics.horiAdvance = advance_width;
+          glyph->metrics.vertAdvance = advance_height;
+        }
+        else
+        {
+          glyph->metrics.horiAdvance = FT_MulFix( advance_width,
+                                                  size->metrics->x_scale );
+          glyph->metrics.vertAdvance = FT_MulFix( advance_height,
+                                                  size->metrics->y_scale );
+        }
+
+        FT_TRACE3(( "Successfully loaded VARC glyph\n" ));
+        goto Exit;
+      }
+
+      FT_TRACE3(( "Failed to load VARC glyph, falling back to glyf\n" ));
+    }
+
+#endif /* TT_CONFIG_OPTION_VARC */
+
     error = tt_loader_init( &loader, size, glyph, load_flags, FALSE );
     if ( error )
       goto Exit;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c	2026-11-15 23:20:43.000000000 +0000
@@ -129,6 +129,12 @@
    *   stream ::
    *     The data stream.
    *
+   *   scratch ::
+   *     A caller-provided scratch buffer for temporary storage.
+   *
+   *   scratch_cap ::
+   *     The size of `scratch`.
+   *
    * @Output:
    *   point_cnt ::
    *     The number of points read.  A zero value means that
@@ -140,8 +146,10 @@
    *   special value ALL_POINTS.
    */
   static FT_UShort*
-  ft_var_readpackedpoints( FT_Stream  stream,
-                           FT_UInt   *point_cnt )
+  ft_var_readpackedpoints( FT_Stream   stream,
+                           FT_UInt    *point_cnt,
+                           FT_UShort*  scratch,
+                           FT_UInt     scratch_cap )
   {
     FT_UShort *points = NULL;
     FT_UInt    n;
@@ -166,7 +174,11 @@
       n  |= FT_GET_BYTE();
     }
 
-    if ( FT_QNEW_ARRAY( points, n ) )
+    /* Re-use `scratch` if it is large enough; this avoids */
+    /* a heap allocation per tuple in the common case.     */
+    if ( scratch && n <= scratch_cap )
+      points = scratch;
+    else if ( FT_QNEW_ARRAY( points, n ) )
       return NULL;
 
     p     = stream->cursor;
@@ -218,7 +230,8 @@
   Fail:
     FT_TRACE1(( "ft_var_readpackedpoints: invalid table\n" ));
 
-    FT_FREE( points );
+    if ( points != scratch )
+      FT_FREE( points );
     return NULL;
   }
 
@@ -244,6 +257,12 @@
    *   delta_cnt ::
    *     The number of deltas to be read.
    *
+   *   scratch ::
+   *     A caller-provided scratch buffer for temporary storage.
+   *
+   *   scratch_cap ::
+   *     The size of `scratch`.
+   *
    * @Return:
    *   An array of FT_Fixed containing the deltas for the affected
    *   points.  (This only gets the deltas for one dimension.  It will
@@ -256,7 +275,9 @@
    */
   static FT_Fixed*
   ft_var_readpackeddeltas( FT_Stream  stream,
-                           FT_UInt    delta_cnt )
+                           FT_UInt    delta_cnt,
+                           FT_Fixed*  scratch,
+                           FT_UInt    scratch_cap )
   {
     FT_Fixed  *deltas = NULL;
     FT_UInt    runcnt, cnt;
@@ -266,7 +287,11 @@
     FT_Error   error;
 
 
-    if ( FT_QNEW_ARRAY( deltas, delta_cnt ) )
+    /* Re-use `scratch` if it is large enough; this avoids */
+    /* a heap allocation per tuple in the common case.     */
+    if ( scratch && delta_cnt <= scratch_cap )
+      deltas = scratch;
+    else if ( FT_QNEW_ARRAY( deltas, delta_cnt ) )
       return NULL;
 
     p = stream->cursor;
@@ -314,7 +339,8 @@
   Fail:
     FT_TRACE1(( "ft_var_readpackeddeltas: invalid table\n" ));
 
-    FT_FREE( deltas );
+    if ( deltas != scratch )
+      FT_FREE( deltas );
     return NULL;
   }
 
@@ -1175,11 +1201,12 @@
 
     GX_ItemVarData  varData;
 
-    FT_UInt   master;
-    FT_Int64  returnValue = FT_INT64_ZERO;
-    FT_UInt   shift_base  = 1;
-    FT_UInt   per_region_size;
-    FT_Byte*  bytes;
+    FT_UInt    master;
+    FT_Int64   returnValue = FT_INT64_ZERO;
+    FT_UInt    shift_base  = 1;
+    FT_UInt    per_region_size;
+    FT_Byte*   bytes;
+    FT_Fixed*  regionScalars;
 
 
     if ( !ttface->blend || !ttface->blend->normalizedcoords )
@@ -1217,6 +1244,67 @@
 
     bytes = varData->deltaSet + per_region_size * innerIndex;
 
+    /* The region scalars depend only on the normalized coordinates, which */
+    /* are constant while glyphs are loaded; yet this function is called   */
+    /* once per item (e.g., per glyph for 'HVAR' advances).  Cache the     */
+    /* scalars per store and recompute only when the coordinates change.   */
+    /* `regionScalars` stays NULL (falling back to recomputation) if the   */
+    /* cache cannot be allocated.                                          */
+    regionScalars = itemStore->regionScalars;
+    {
+      FT_Fixed*  ncoords = ttface->blend->normalizedcoords;
+      FT_Bool    fresh   = FT_BOOL( regionScalars != NULL );
+      FT_UInt    a;
+
+
+      if ( fresh )
+      {
+        for ( a = 0; a < itemStore->axisCount; a++ )
+          if ( itemStore->cachedCoords[a] != ncoords[a] )
+          {
+            fresh = FALSE;
+            break;
+          }
+      }
+
+      if ( !fresh )
+      {
+        FT_Memory  memory = FT_FACE_MEMORY( face );
+        FT_Error   error  = FT_Err_Ok;
+
+        FT_UNUSED( error );
+
+
+        if ( !regionScalars )
+        {
+          if ( !FT_QNEW_ARRAY( itemStore->regionScalars,
+                               itemStore->regionCount ) &&
+               !FT_QNEW_ARRAY( itemStore->cachedCoords,
+                               itemStore->axisCount )   )
+            regionScalars = itemStore->regionScalars;
+          else
+          {
+            FT_FREE( itemStore->regionScalars );
+            FT_FREE( itemStore->cachedCoords );
+          }
+        }
+
+        if ( regionScalars )
+        {
+          FT_UInt  r;
+
+
+          for ( r = 0; r < itemStore->regionCount; r++ )
+            regionScalars[r] = tt_calculate_scalar(
+                                 itemStore->varRegionList[r].axisList,
+                                 itemStore->axisCount,
+                                 ncoords );
+          for ( a = 0; a < itemStore->axisCount; a++ )
+            itemStore->cachedCoords[a] = ncoords[a];
+        }
+      }
+    }
+
     /* outer loop steps through master designs to be blended */
     for ( master = 0; master < varData->regionIdxCount; master++ )
     {
@@ -1224,10 +1312,12 @@
 
       GX_AxisCoords  axis = itemStore->varRegionList[regionIndex].axisList;
 
-      FT_Fixed  scalar = tt_calculate_scalar(
-                           axis,
-                           itemStore->axisCount,
-                           ttface->blend->normalizedcoords );
+      FT_Fixed  scalar = regionScalars
+                           ? regionScalars[regionIndex]
+                           : tt_calculate_scalar(
+                               axis,
+                               itemStore->axisCount,
+                               ttface->blend->normalizedcoords );
 
 
       if ( scalar )
@@ -1755,7 +1845,7 @@
     FT_UShort  axisCount;
     FT_UShort  globalCoordCount;
     FT_ULong   offsetToCoord;
-    FT_UShort  glyphCount;
+    FT_UInt32  glyphCount;
     FT_UShort  flags;
     FT_ULong   offsetToData;
 
@@ -1781,16 +1871,24 @@
   static FT_Error
   ft_var_load_gvar( TT_Face  face )
   {
-    FT_Stream     stream = FT_FACE_STREAM( face );
-    FT_Memory     memory = stream->memory;
-    GX_Blend      blend  = face->blend;
-    FT_Error      error;
-    FT_UInt       i, j;
-    FT_Byte*      bytes;
-    FT_ULong      table_len;
-    FT_ULong      gvar_start;
-    FT_ULong      offsetToData;
-    FT_ULong      offsets_len;
+    FT_Error  error;
+
+    FT_Stream  stream = FT_FACE_STREAM( face );
+    FT_Memory  memory = stream->memory;
+
+    GX_Blend  blend         = face->blend;
+    FT_Bool   blend_created = FALSE;
+    FT_Bool   is_extended   = FALSE;
+
+    FT_UInt   i, j;
+    FT_Byte*  bytes;
+    FT_ULong  table_len;
+    FT_ULong  gvar_start;
+    FT_ULong  header_size;
+
+    FT_ULong  offsetToData;
+    FT_ULong  offsets_len;
+
     GX_GVar_Head  gvar_head;
 
     static const FT_Frame_Field  gvar_fields[] =
@@ -1799,33 +1897,68 @@
 #undef  FT_STRUCTURE
 #define FT_STRUCTURE  GX_GVar_Head
 
-      FT_FRAME_START( 20 ),
+      FT_FRAME_START( 12 ),
         FT_FRAME_LONG  ( version ),
         FT_FRAME_USHORT( axisCount ),
         FT_FRAME_USHORT( globalCoordCount ),
         FT_FRAME_ULONG ( offsetToCoord ),
-        FT_FRAME_USHORT( glyphCount ),
-        FT_FRAME_USHORT( flags ),
-        FT_FRAME_ULONG ( offsetToData ),
       FT_FRAME_END
     };
 
 
     FT_TRACE2(( "GVAR " ));
 
-    if ( FT_SET_ERROR( face->goto_table( face,
-                                         TTAG_gvar,
-                                         stream,
-                                         &table_len ) ) )
+    error = face->goto_table( face,
+                              face->is_extended_glyf ? TTAG_GVAR
+                                                     : TTAG_gvar,
+                              stream,
+                              &table_len );
+    if ( FT_ERR_EQ( error, Table_Missing ) && !face->is_extended_glyf )
+    {
+      error = face->goto_table( face, TTAG_GVAR, stream, &table_len );
+      if ( !error )
+        is_extended = TRUE;
+    }
+    else if ( !error && face->is_extended_glyf )
+      is_extended = TRUE;
+
+    if ( error )
     {
       FT_TRACE2(( "is missing\n" ));
       goto Exit;
     }
 
+    header_size = is_extended ? 21 : 20;
+    if ( table_len < header_size )
+    {
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+
     gvar_start = FT_STREAM_POS( );
     if ( FT_STREAM_READ_FIELDS( gvar_fields, &gvar_head ) )
       goto Exit;
 
+    if ( is_extended )
+    {
+      if ( FT_READ_UOFF3( gvar_head.glyphCount ) )
+        goto Exit;
+    }
+    else
+    {
+      FT_UShort  glyph_count;
+
+
+      if ( FT_READ_USHORT( glyph_count ) )
+        goto Exit;
+
+      gvar_head.glyphCount = glyph_count;
+    }
+
+    if ( FT_READ_USHORT( gvar_head.flags )       ||
+         FT_READ_ULONG( gvar_head.offsetToData ) )
+      goto Exit;
+
     if ( gvar_head.version != 0x00010000L )
     {
       FT_TRACE1(( "bad table version\n" ));
@@ -1833,7 +1966,25 @@
       goto Exit;
     }
 
-    if ( gvar_head.axisCount != (FT_UShort)blend->mmvar->num_axis )
+    /*
+     * VARC can use normalized coordinates for component-internal axes in a
+     * static font, where 'gvar' is present without 'fvar'.  Set up the
+     * private part of the blend machinery in that case; it deliberately has
+     * no `mmvar`, so the axes remain invisible through the public MM API.
+     */
+    if ( !blend )
+    {
+      if ( FT_SET_ERROR( tt_var_init_blend( FT_FACE( face ),
+                                            gvar_head.axisCount ) ) )
+        goto Exit;
+
+      blend         = face->blend;
+      blend_created = TRUE;
+    }
+
+    blend->gvar_is_extended = is_extended;
+
+    if ( gvar_head.axisCount != (FT_UShort)blend->num_axis )
     {
       FT_TRACE1(( "ft_var_load_gvar:"
                   " number of axes in `gvar' and `cvar'\n" ));
@@ -1858,7 +2009,7 @@
                   ( ( gvar_head.flags & 1 ) ? 4L : 2L );
 
     /* rough sanity check */
-    if (offsets_len > table_len )
+    if ( offsets_len > table_len - header_size )
     {
       FT_TRACE1(( "ft_var_load_gvar: invalid number of glyphs\n" ));
       error = FT_THROW( Invalid_Table );
@@ -1999,14 +2150,32 @@
                          gvar_head.globalCoordCount ) )
         goto Fail2;
 
-      blend->tuplecount = gvar_head.globalCoordCount;
+      /* The tuple index in each glyph variation tuple header is only 12 */
+      /* bits wide (`GX_TI_TUPLE_INDEX_MASK`), so shared tuples with a   */
+      /* higher index can never be referenced.  Clamp the count to the   */
+      /* largest addressable value, `GX_TI_TUPLE_INDEX_MASK + 1`.  This  */
+      /* also lets the fast path in `TT_Vary_Apply_Glyph_Deltas` rely on */
+      /* a set tuple flag forcing the masked value out of range.         */
+      blend->tuplecount =
+        gvar_head.globalCoordCount > GX_TI_TUPLE_INDEX_MASK + 1
+          ? GX_TI_TUPLE_INDEX_MASK + 1
+          : gvar_head.globalCoordCount;
 
       FT_TRACE5(( "\n" ));
 
       FT_FRAME_EXIT();
     }
 
+    if ( blend_created )
+    {
+      for ( i = 0; i < blend->tuplecount; i++ )
+        blend->tuplescalars[i] = (FT_Fixed)-0x20000L;
+    }
+
   Exit:
+    if ( error && blend_created )
+      tt_done_blend( FT_FACE( face ) );
+
     return error;
 
   Fail2:
@@ -2022,6 +2191,70 @@
   /**************************************************************************
    *
    * @Function:
+   *   tt_var_init_gvar
+   *
+   * @Description:
+   *   Initialize the private 'gvar' blend state.  This also supports the
+   *   static-font case where VARC addresses component-internal axes and no
+   *   'fvar' table is present.
+   */
+  FT_LOCAL_DEF( FT_Error )
+  tt_var_init_gvar( FT_Face  face )
+  {
+    TT_Face  ttface = (TT_Face)face;
+
+
+    if ( ttface->blend && ttface->blend->glyphoffsets )
+      return FT_Err_Ok;
+
+    return ft_var_load_gvar( ttface );
+  }
+
+
+  /**************************************************************************
+   *
+   * @Function:
+   *   tt_var_init_blend
+   *
+   * @Description:
+   *   Initialize a private normalized-coordinate vector without 'fvar'.
+   *   CFF2 VARC glyphs use this with the axis count from their variation
+   *   store; TrueType VARC glyphs get the count from 'gvar' above.
+   */
+  FT_LOCAL_DEF( FT_Error )
+  tt_var_init_blend( FT_Face  face,
+                     FT_UInt  axis_count )
+  {
+    TT_Face    ttface = (TT_Face)face;
+    FT_Memory  memory = FT_FACE_MEMORY( face );
+    FT_Error   error  = FT_Err_Ok;
+    GX_Blend   blend  = ttface->blend;
+
+
+    if ( blend )
+      return blend->num_axis == axis_count
+               ? FT_Err_Ok
+               : FT_THROW( Invalid_Table );
+
+    if ( FT_NEW( blend ) )
+      return error;
+
+    blend->num_axis = axis_count;
+    ttface->blend   = blend;
+
+    if ( FT_NEW_ARRAY( blend->normalizedcoords, axis_count ) )
+    {
+      FT_FREE( blend );
+      ttface->blend = NULL;
+    }
+
+    return error;
+  }
+
+
+  /**************************************************************************
+   *
+   * @Function:
    *   ft_var_apply_tuple
    *
    * @Description:
@@ -2507,6 +2740,11 @@
       FT_FRAME_END
     };
 
+    /* A static VARC face can have a private blend initialized from 'gvar' */
+    /* without exposing variation axes through the public MM API.          */
+    if ( ttface->blend && !ttface->blend->mmvar )
+      return FT_THROW( Table_Missing );
+
     /* `num_instances` holds the number of all named instances including  */
     /* the default instance, which might be missing in the table of named */
     /* instances (in 'fvar').  This value is validated in `sfobjs.c` and  */
@@ -3453,9 +3691,7 @@
     TT_Face       ttface = (TT_Face)face;
     FT_Error      error  = FT_Err_Ok;
     GX_Blend      blend;
-    FT_MM_Var*    mmvar;
-    FT_Var_Axis*  a;
-    FT_UInt       i, nc;
+    FT_UInt       i;
 
 
     if ( !ttface->blend )
@@ -3474,31 +3710,30 @@
         return error;
     }
 
-    nc = num_coords;
     if ( num_coords > blend->num_axis )
     {
       FT_TRACE2(( "TT_Get_Var_Design:"
                   " only using first %u of %u coordinates\n",
                   blend->num_axis, num_coords ));
-      nc = blend->num_axis;
+
+      FT_ARRAY_ZERO( coords + blend->num_axis, num_coords - blend->num_axis );
+      num_coords = blend->num_axis;
     }
 
-    mmvar = blend->mmvar;
-    a     = mmvar->axis;
     if ( ttface->doblend )
     {
-      for ( i = 0; i < nc; i++, a++ )
+      for ( i = 0; i < num_coords; i++ )
         coords[i] = blend->coords[i];
     }
     else
     {
-      for ( i = 0; i < nc; i++, a++ )
+      FT_Var_Axis*  a = blend->mmvar->axis;
+
+
+      for ( i = 0; i < num_coords; i++, a++ )
         coords[i] = a->def;
     }
 
-    for ( ; i < num_coords; i++, a++ )
-      coords[i] = a->def;
-
     return FT_Err_Ok;
   }
 
@@ -3804,7 +4039,8 @@
 
       FT_Stream_SeekSet( stream, offsetToData );
 
-      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
+      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count,
+                                              NULL, 0 );
 
       offsetToData = FT_Stream_FTell( stream );
 
@@ -3879,7 +4115,8 @@
 
       if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
       {
-        localpoints = ft_var_readpackedpoints( stream, &point_count );
+        localpoints = ft_var_readpackedpoints( stream, &point_count,
+                                               NULL, 0 );
         points      = localpoints;
       }
       else
@@ -3891,7 +4128,8 @@
 
       deltas = ft_var_readpackeddeltas( stream,
                                         point_count == 0 ? face->cvt_size
-                                                         : point_count );
+                                                         : point_count,
+                                        NULL, 0 );
 
       if ( !points || !deltas )
         ; /* failure, ignore it */
@@ -4025,13 +4263,13 @@
   /* modeled after `af_iup_shift' */
 
   static void
-  tt_delta_shift( int         p1,
-                  int         p2,
-                  int         ref,
+  tt_delta_shift( FT_UInt     p1,
+                  FT_UInt     p2,
+                  FT_UInt     ref,
                   FT_Vector*  in_points,
                   FT_Vector*  out_points )
   {
-    int        p;
+    FT_UInt    p;
     FT_Vector  delta;
 
 
@@ -4062,14 +4300,14 @@
   /* modeled after `af_iup_interp', `_iup_worker_interpolate', and   */
   /* `Ins_IUP' with spec differences in handling ill-defined cases.  */
   static void
-  tt_delta_interpolate( int         p1,
-                        int         p2,
-                        int         ref1,
-                        int         ref2,
+  tt_delta_interpolate( FT_UInt     p1,
+                        FT_UInt     p2,
+                        FT_UInt     ref1,
+                        FT_UInt     ref2,
                         FT_Vector*  in_points,
                         FT_Vector*  out_points )
   {
-    int  p, i;
+    FT_UInt  p, i;
 
     FT_Pos  out, in1, in2, out1, out2, d1, d2;
 
@@ -4135,24 +4373,18 @@
                          FT_Vector*   in_points,
                          FT_Bool*     has_delta )
   {
-    FT_Int  first_point;
-    FT_Int  end_point;
-
-    FT_Int  first_delta;
-    FT_Int  cur_delta;
+    FT_UInt  first_point;
+    FT_UInt  end_point;
 
-    FT_Int    point;
-    FT_Short  contour;
+    FT_UInt  first_delta;
+    FT_UInt  cur_delta;
 
+    FT_UInt  point;
+    FT_UInt  contour;
 
-    /* ignore empty outlines */
-    if ( !outline->n_contours )
-      return;
-
-    contour = 0;
-    point   = 0;
 
-    do
+    for ( point = 0, contour = 0;
+          contour < outline->n_contours; contour++ )
     {
       end_point   = outline->contours[contour];
       first_point = point;
@@ -4213,9 +4445,7 @@
                                   out_points );
         }
       }
-      contour++;
-
-    } while ( contour < outline->n_contours );
+    }
   }
 
 
@@ -4269,6 +4499,8 @@
 
     FT_UInt   peak_coords_size;
     FT_UInt   point_deltas_x_size;
+    FT_UInt   deltas_buf_size;
+    FT_UInt   points_buf_size;
     FT_UInt   points_org_size;
     FT_UInt   points_out_size;
     FT_UInt   has_delta_size;
@@ -4286,15 +4518,25 @@
     FT_UInt  point_count;
     FT_UInt  spoint_count = 0;
 
-    FT_UShort*  sharedpoints = NULL;
-    FT_UShort*  localpoints  = NULL;
+    FT_UShort*  sharedpoints      = NULL;
+    FT_UShort*  localpoints       = NULL;
     FT_UShort*  points;
+    /* scratch buffer pool for `sharedpoints` */
+    FT_UShort*  shared_points_buf = NULL;
+    /* scratch buffer pool for `localpoints` */
+    FT_UShort*  local_points_buf;
 
     FT_Fixed*  deltas_x       = NULL;
     FT_Fixed*  deltas_y       = NULL;
+    /* scratch buffer pool for `deltas_x` */
+    FT_Fixed*  deltas_x_buf;
+    /* scratch buffer pool for `deltas_y` */
+    FT_Fixed*  deltas_y_buf;
     FT_Fixed*  point_deltas_x = NULL;
     FT_Fixed*  point_deltas_y = NULL;
 
+    FT_Fixed*  tupleScalars;
+
 
     for ( i = 0; i < n_points; i++ )
     {
@@ -4328,8 +4570,15 @@
 
     /* each set of glyph variation data is formatted similarly to `cvar' */
 
+    if ( dataSize < ( blend->gvar_is_extended ? 5U : 4U ) )
+    {
+      error = FT_THROW( Invalid_Table );
+      goto FExit;
+    }
+
     tupleCount   = FT_GET_USHORT();
-    offsetToData = FT_GET_USHORT();
+    offsetToData = blend->gvar_is_extended ? FT_GET_UOFF3()
+                                           : FT_GET_USHORT();
 
     /* rough sanity test */
     if ( offsetToData > dataSize                                ||
@@ -4344,57 +4593,62 @@
 
     offsetToData += glyph_start;
 
-    if ( tupleCount & GX_TC_TUPLES_SHARE_POINT_NUMBERS )
-    {
-      here = FT_Stream_FTell( stream );
-
-      FT_Stream_SeekSet( stream, offsetToData );
-
-      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
-
-      offsetToData = FT_Stream_FTell( stream );
-
-      FT_Stream_SeekSet( stream, here );
-    }
-
-    FT_TRACE5(( "gvar: there %s %u tuple%s:\n",
-                ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "is" : "are",
-                tupleCount & GX_TC_TUPLE_COUNT_MASK,
-                ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
-
+    /* Re-use a per-face scratch pool, grown on demand, instead of      */
+    /* allocating (and freeing) it on every glyph.  This pool is freed  */
+    /* in `tt_done_blend`.  The shared/local point-number lists are     */
+    /* carved out of it too, so it must be set up before they are read. */
     peak_coords_size    = ALIGN_SIZE( 3 * blend->num_axis *
                                       sizeof ( *peak_coords ) );
     point_deltas_x_size = ALIGN_SIZE( 2 * n_points *
                                       sizeof ( *point_deltas_x ) );
+    deltas_buf_size     = ALIGN_SIZE( 2 * n_points *
+                                      sizeof ( *deltas_x ) );
+    points_buf_size     = ALIGN_SIZE( 2 * n_points *
+                                      sizeof ( *shared_points_buf ) );
     points_org_size     = ALIGN_SIZE( n_points * sizeof ( *points_org ) );
     points_out_size     = ALIGN_SIZE( n_points * sizeof ( *points_out ) );
     has_delta_size      = ALIGN_SIZE( n_points * sizeof ( *has_delta ) );
 
     pool_size = peak_coords_size    +
                 point_deltas_x_size +
+                deltas_buf_size     +
+                points_buf_size     +
                 points_org_size     +
                 points_out_size     +
                 has_delta_size;
 
-    if ( FT_ALLOC( pool, pool_size ) )
-      goto Exit;
-
-    p               = pool;
-    peak_coords     = (FT_Fixed*)p;
-    p              += peak_coords_size;
-    point_deltas_x  = (FT_Fixed*)p;
-    p              += point_deltas_x_size;
-    points_org      = (FT_Vector*)p;
-    p              += points_org_size;
-    points_out      = (FT_Vector*)p;
-    p              += points_out_size;
-    has_delta       = (FT_Bool*)p;
+    if ( pool_size > blend->glyph_delta_pool_size )
+    {
+      if ( FT_QREALLOC( blend->glyph_delta_pool,
+                        blend->glyph_delta_pool_size,
+                        pool_size ) )
+        goto Exit;
+      blend->glyph_delta_pool_size = pool_size;
+    }
+    pool = blend->glyph_delta_pool;
+
+    p                  = pool;
+    peak_coords        = (FT_Fixed*)p;
+    p                 += peak_coords_size;
+    point_deltas_x     = (FT_Fixed*)p;
+    p                 += point_deltas_x_size;
+    deltas_x_buf       = (FT_Fixed*)p;
+    p                 += deltas_buf_size;
+    shared_points_buf  = (FT_UShort*)p;
+    p                 += points_buf_size;
+    points_org         = (FT_Vector*)p;
+    p                 += points_org_size;
+    points_out         = (FT_Vector*)p;
+    p                 += points_out_size;
+    has_delta          = (FT_Bool*)p;
 
     FT_ARRAY_ZERO( point_deltas_x, 2 * n_points );
 
-    im_start_coords = peak_coords + blend->num_axis;
-    im_end_coords   = im_start_coords + blend->num_axis;
-    point_deltas_y  = point_deltas_x + n_points;
+    im_start_coords  = peak_coords + blend->num_axis;
+    im_end_coords    = im_start_coords + blend->num_axis;
+    point_deltas_y   = point_deltas_x + n_points;
+    deltas_y_buf     = deltas_x_buf + n_points;
+    local_points_buf = shared_points_buf + n_points;
 
     for ( j = 0; j < n_points; j++ )
     {
@@ -4402,39 +4656,102 @@
       points_org[j].y = FT_intToFixed( outline->points[j].y );
     }
 
-    p = stream->cursor;
+    if ( tupleCount & GX_TC_TUPLES_SHARE_POINT_NUMBERS )
+    {
+      here = FT_Stream_FTell( stream );
+
+      FT_Stream_SeekSet( stream, offsetToData );
+
+      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count,
+                                              shared_points_buf, n_points );
+
+      offsetToData = FT_Stream_FTell( stream );
+
+      FT_Stream_SeekSet( stream, here );
+    }
+
+    FT_TRACE5(( "gvar: there %s %u tuple%s:\n",
+                ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "is" : "are",
+                tupleCount & GX_TC_TUPLE_COUNT_MASK,
+                ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
+
+    p            = stream->cursor;
+    tupleScalars = blend->tuplescalars;
 
     tupleCount &= GX_TC_TUPLE_COUNT_MASK;
+
+    /* The tuple-variation headers are walked sequentially through `p`.   */
+    /* Each header is at least four bytes (`tupleDataSize` and            */
+    /* `tupleIndex`); embedded and intermediate tuples store additional   */
+    /* coordinate arrays after that.  Bounds-check the four-byte minimum  */
+    /* of *all* tuples here, once, so the common path inside the loop     */
+    /* needs no per-tuple check.  This is sound because `p` only ever     */
+    /* advances over these headers -- the variation data of active tuples */
+    /* is read further below through a separate stream cursor -- and      */
+    /* `stream->limit` stays constant within the frame entered above.     */
+    /* Whenever a tuple consumes more than the four-byte minimum, the     */
+    /* embedded/intermediate branches re-check the surplus (see below).   */
+    if ( 4 * tupleCount > (FT_UInt)( stream->limit - p ) )
+    {
+      FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
+                  " invalid glyph variation array header\n" ));
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+
     for ( i = 0; i < tupleCount; i++ )
     {
       FT_UInt    tupleDataSize;
       FT_UInt    tupleIndex;
       FT_Fixed   apply;
-      FT_Fixed*  tupleScalars;
 
 
       FT_TRACE6(( "  tuple %u:\n", i ));
 
-      tupleScalars = blend->tuplescalars;
+      /* The four-byte header is already covered by the up-front check. */
+      tupleDataSize = FT_NEXT_USHORT( p );
+      tupleIndex    = FT_NEXT_USHORT( p );
 
-      /* Enter frame for four bytes. */
-      if ( 4 > stream->limit - p )
+      /* Fast path for the common shared-tuple case.                       */
+      /*                                                                   */
+      /* `blend->tuplecount` is clamped to `GX_TI_TUPLE_INDEX_MASK + 1` at */
+      /* load time, so it is at most 0x1000.  Of the tuple-index flags     */
+      /* only `GX_TI_PRIVATE_POINT_NUMBERS` (0x2000) may legitimately      */
+      /* accompany a shared-tuple index, so it is masked off here; the     */
+      /* embedded (0x8000), intermediate (0x4000), and reserved (0x1000)   */
+      /* flags each yield a value >= 0x1000 >= `blend->tuplecount', so if  */
+      /* any is set the comparison is false.  Entering the body therefore  */
+      /* guarantees a plain shared tuple with an in-range index whose      */
+      /* scalar lives in the cache.                                        */
+      if ( ( tupleIndex & ~GX_TI_PRIVATE_POINT_NUMBERS )
+           < blend->tuplecount )
       {
-        FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
-                    " invalid glyph variation array header\n" ));
-        error = FT_THROW( Invalid_Table );
-        goto Exit;
-      }
+        FT_Fixed  scalar = tupleScalars[tupleIndex & GX_TI_TUPLE_INDEX_MASK];
 
-      tupleDataSize = FT_NEXT_USHORT( p );
-      tupleIndex    = FT_NEXT_USHORT( p );
 
-      if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
-        tupleScalars = NULL;
+        if ( scalar == 0 )
+        {
+          offsetToData += tupleDataSize;
+          continue;
+        }
+
+        if ( scalar != (FT_Fixed)-0x20000 )
+        {
+          apply = scalar;
+          goto apply_found;
+        }
+      }
 
       if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
       {
-        if ( 2 * blend->num_axis > (FT_UInt)( stream->limit - p ) )
+        /* This tuple stores its peak coordinates inline.  `p` has        */
+        /* advanced past the four-byte header, so the up-front check now  */
+        /* only accounts for the four-byte minimum of the tuples still to */
+        /* come, `4 * ( tupleCount - i - 1 )`.  Ensure the embedded       */
+        /* coordinates fit on top of that reserve; this bounds the read   */
+        /* and keeps the invariant intact for the following tuples.       */
+        if ( 2 * blend->num_axis + 4 * ( tupleCount - i - 1 ) >
+               (FT_UInt)( stream->limit - p ) )
         {
           FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
                       " invalid glyph variation array header\n" ));
@@ -4446,22 +4763,9 @@
           peak_coords[j] = FT_fdot14ToFixed( FT_NEXT_SHORT( p ) );
 
         tuple_coords = peak_coords;
-        tupleScalars = NULL;
       }
       else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) < blend->tuplecount )
       {
-        FT_Fixed  scalar =
-                    tupleScalars
-                      ? tupleScalars[tupleIndex & GX_TI_TUPLE_INDEX_MASK]
-                      : (FT_Fixed)-0x20000;
-
-
-        if ( scalar != (FT_Fixed)-0x20000 )
-        {
-          apply = scalar;
-          goto apply_found;
-        }
-
         tuple_coords = blend->tuplecoords +
                          ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) *
                          blend->num_axis;
@@ -4477,7 +4781,12 @@
 
       if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
       {
-        if ( 4 * blend->num_axis > (FT_UInt)( stream->limit - p ) )
+        /* Intermediate tuples store inline start and end coordinates,    */
+        /* `4 * num_axis` bytes in total.  As above, check them against   */
+        /* the four-byte reserve of the remaining tuples so the invariant */
+        /* survives into the next iteration.                              */
+        if ( 4 * blend->num_axis + 4 * ( tupleCount - i - 1 ) >
+               (FT_UInt)( stream->limit - p ) )
         {
           FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
                       " invalid glyph variation array header\n" ));
@@ -4497,7 +4806,9 @@
                                   im_start_coords,
                                   im_end_coords );
 
-      if ( tupleScalars )
+      /* Cache the scalar for shared tuples only (see fast path above). */
+      if ( ( tupleIndex & ~GX_TI_PRIVATE_POINT_NUMBERS )
+           < blend->tuplecount )
         tupleScalars[tupleIndex & GX_TI_TUPLE_INDEX_MASK] = apply;
 
     apply_found:
@@ -4514,7 +4825,8 @@
 
       if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
       {
-        localpoints = ft_var_readpackedpoints( stream, &point_count );
+        localpoints = ft_var_readpackedpoints( stream, &point_count,
+                                               local_points_buf, n_points );
         points      = localpoints;
       }
       else
@@ -4525,10 +4837,14 @@
 
       deltas_x = ft_var_readpackeddeltas( stream,
                                           point_count == 0 ? n_points
-                                                           : point_count );
+                                                           : point_count,
+                                          deltas_x_buf,
+                                          n_points );
       deltas_y = ft_var_readpackeddeltas( stream,
                                           point_count == 0 ? n_points
-                                                           : point_count );
+                                                           : point_count,
+                                          deltas_y_buf,
+                                          n_points );
 
       if ( !points || !deltas_y || !deltas_x )
         ; /* failure, ignore it */
@@ -4653,10 +4969,14 @@
 #endif
       }
 
-      if ( localpoints != ALL_POINTS )
+      /* Only free deltas that fell back to a heap allocation; */
+      /* the common case reuses the pooled scratch buffers.    */
+      if ( localpoints != ALL_POINTS && localpoints != local_points_buf )
         FT_FREE( localpoints );
-      FT_FREE( deltas_x );
-      FT_FREE( deltas_y );
+      if ( deltas_x != deltas_x_buf )
+        FT_FREE( deltas_x );
+      if ( deltas_y != deltas_y_buf )
+        FT_FREE( deltas_y );
 
       offsetToData += tupleDataSize;
 
@@ -4711,9 +5031,10 @@
     }
 
   Exit:
-    if ( sharedpoints != ALL_POINTS )
+    if ( sharedpoints != ALL_POINTS && sharedpoints != shared_points_buf )
       FT_FREE( sharedpoints );
-    FT_FREE( pool );
+    /* The persistent per-face scratch buffer (`blend->glyph_delta_pool`) */
+    /* is freed in `tt_done_blend`, not here.                             */
 
   FExit:
     FT_FRAME_EXIT();
@@ -4793,6 +5114,9 @@
 
       FT_FREE( itemStore->varRegionList );
     }
+
+    FT_FREE( itemStore->regionScalars );
+    FT_FREE( itemStore->cachedCoords );
   }
 
 
@@ -4829,13 +5153,13 @@
       FT_UInt  i, num_axes;
 
 
-      /* blend->num_axis might not be set up yet */
-      num_axes = blend->mmvar->num_axis;
+      num_axes = blend->num_axis;
 
       FT_FREE( blend->coords );
       FT_FREE( blend->normalizedcoords );
       FT_FREE( blend->normalized_stylecoords );
       FT_FREE( blend->mmvar );
+      FT_FREE( blend->glyph_delta_pool );
 
       if ( blend->avar_table )
       {
@@ -4888,6 +5212,9 @@
       FT_FREE( blend->tuplecoords );
       FT_FREE( blend->glyphoffsets );
       FT_FREE( blend );
+
+      /* the face may outlive its blend (e.g., after a failed setup) */
+      ttface->blend = NULL;
     }
   }
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h	2026-11-15 23:20:43.000000000 +0000
@@ -262,6 +262,10 @@
    *   gv_glyphcnt ::
    *     The number of glyphs handled in the `gvar' table.
    *
+   *   gvar_is_extended ::
+   *     A boolean which is set when glyph variation data comes from the
+   *     'GVAR' table (instead of 'gvar').
+   *
    *   glyphoffsets ::
    *     Offsets into the glyph variation data array.
    *
@@ -300,10 +304,16 @@
     FT_Fixed*       tuplescalars;     /* tuplescalars[tuplecount]          */
 
     FT_UInt         gv_glyphcnt;
+    FT_Bool         gvar_is_extended;
     FT_ULong*       glyphoffsets;         /* glyphoffsets[gv_glyphcnt + 1] */
 
     FT_ULong        gvar_size;
 
+    /* Scratch pool reused across glyphs by `TT_Vary_Apply_Glyph_Deltas`, */
+    /* grown on demand, to avoid per-glyph/per-tuple heap allocations.    */
+    FT_Byte*        glyph_delta_pool;
+    FT_ULong        glyph_delta_pool_size;
+
   } GX_BlendRec;
 
 
@@ -443,6 +453,13 @@
                     FT_Fixed*   *normalizedcoords,
                     FT_MM_Var*  *mm_var );
 
+  FT_LOCAL( FT_Error )
+  tt_var_init_gvar( FT_Face  face );
+
+  FT_LOCAL( FT_Error )
+  tt_var_init_blend( FT_Face  face,
+                     FT_UInt  axis_count );
+
   FT_LOCAL( void )
   tt_done_blend( FT_Face  face );
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c	2026-11-15 23:20:43.000000000 +0000
@@ -1104,7 +1104,7 @@
   /* documentation is in freetype.h */
 
   static __inline FT_Int32
-  TT_MulFixi14_i386( FT_Int32  a,
+  TT_MulFix14_i386( FT_Int32  a,
                      FT_Int32  b )
   {
     FT_Int32  result;
@@ -1499,7 +1499,9 @@
    *
    * @Note:
    *   See `ttinterp.h' for details on backward compatibility mode.
-   *   `Touches' the point.
+   *   `Touches' the point.  When both freedom and projection vectors
+   *   are aligned along the axes, the moves are handled by simplified
+   *   versions of this function; more complex moves are handled here.
    */
   static void
   Direct_Move( TT_ExecContext  exc,
@@ -1514,10 +1516,10 @@
     if ( v != 0 )
     {
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-      /* Exception to the post-IUP curfew: Allow the x component of */
-      /* diagonal moves, but only post-IUP.  DejaVu tries to adjust */
-      /* diagonal stems like on `Z' and `z' post-IUP.               */
-      if ( !exc->backward_compatibility )
+      /* See `ttinterp.h' for details on backward compatibility mode.   */
+      /* Exception for horizontal projection is made for Comic Sans MS. */
+      if ( !exc->backward_compatibility ||
+           exc->GS.projVector.y == 0    )
 #endif
         zone->cur[point].x = ADD_LONG( zone->cur[point].x,
                                        FT_MulFix( distance, v ) );
@@ -1529,8 +1531,10 @@
     if ( v != 0 )
     {
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-      /* See `ttinterp.h' for details on backward compatibility mode. */
-      if ( exc->backward_compatibility != 0x7 )
+      /* See `ttinterp.h' for details on backward compatibility mode.   */
+      /* Exception for horizontal projection is made for Comic Sans MS. */
+      if ( exc->backward_compatibility != 0x7 ||
+           exc->GS.projVector.y == 0          )
 #endif
         zone->cur[point].y = ADD_LONG( zone->cur[point].y,
                                        FT_MulFix( distance, v ) );
@@ -1660,6 +1664,27 @@
     zone->org[point].y = ADD_LONG( zone->org[point].y, distance );
   }
 
+
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+
+  static void
+  Update_Native_ClearType_X_State( TT_ExecContext  exc )
+  {
+    /* `backward_compatibility' is also zero in v35, the CVT program, */
+    /* monochrome rendering, and tricky-font execution.               */
+    exc->native_cleartype_x = FT_BOOL(
+      !exc->backward_compatibility        &&
+      exc->GS.projVector.y == 0           &&
+      exc->GS.freeVector.y == 0           &&
+      SUBPIXEL_HINTING_MINIMAL            &&
+      exc->iniRange == tt_coderange_glyph &&
+      exc->mode != FT_RENDER_MODE_MONO    &&
+      !FT_IS_TRICKY( (FT_Face)exc->face ) );
+  }
+
+#endif /* TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL */
+
+
   /**************************************************************************
    *
    * @Function:
@@ -2250,9 +2275,12 @@
       exc->moveVector.x = exc->GS.freeVector.x * 4;
       exc->moveVector.y = exc->GS.freeVector.y * 4;
     }
-    else if ( -0x400L < F_dot_P && F_dot_P < 0x400L )
+    else if ( -0x1555L < F_dot_P && F_dot_P < 0x1555L )
     {
-      /* prohibitively orthogonal */
+      /* prohibitively near-orthogonal; the empirical limit avoids */
+      /* bad rendering in Palatino without negative consequences   */
+      FT_TRACE3(( "F_dot_P = %.2f, too small for valid movement.\n",
+                   F_dot_P / 16384.));
       exc->moveVector.x = 0;
       exc->moveVector.y = 0;
     }
@@ -2292,6 +2320,12 @@
     else
       exc->func_dualproj = (TT_Project_Func)Dual_Project;
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+    /* Projection/freedom-vector changes can enter or leave the */
+    /* native ClearType direction.                              */
+    Update_Native_ClearType_X_State( exc );
+#endif
+
     /* Disable cached aspect ratio */
     exc->tt_metrics.ratio = 0;
   }
@@ -2841,7 +2875,13 @@
         ARRAY_BOUND_ERROR;
     }
     else
+    {
+      Modify_CVT_Check( exc );
+      if ( exc->error )
+        return;
+
       exc->cvt[I] = FT_MulFix( args[1], exc->tt_metrics.scale );
+    }
   }
 
 
@@ -2908,8 +2948,19 @@
   Ins_ROUND( TT_ExecContext  exc,
              FT_Long*        args )
   {
-    args[0] = exc->func_round( exc, args[0],
-                               exc->GS.compensation[exc->opcode & 3] );
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+    /*
+     * Native ClearType applies ROUND to the 1/16-pixel virtual
+     * grid in the ClearType direction.  Approximate this in v40
+     * by leaving the result unrounded.
+     */
+    if ( exc->native_cleartype_x )
+      args[0] = Round_None( exc, args[0],
+                            exc->GS.compensation[exc->opcode & 3] );
+    else
+#endif
+      args[0] = exc->func_round( exc, args[0],
+                                 exc->GS.compensation[exc->opcode & 3] );
   }
 
 
@@ -4722,7 +4773,13 @@
       /* compatibility hacks and lets them program points to the grid like */
       /* it's 1996.  They might sign a waiver for just one glyph, though.  */
       if ( SUBPIXEL_HINTING_MINIMAL )
+      {
         exc->backward_compatibility = ( L & 4 ) ^ 4;
+
+        /* A glyph can temporarily switch between backward-compatible */
+        /* and native ClearType, so update the native-X state too.    */
+        Update_Native_ClearType_X_State( exc );
+      }
 #endif
     }
     else if ( exc->pedantic_hinting )
@@ -4923,37 +4980,38 @@
   Compute_Point_Displacement( TT_ExecContext  exc,
                               FT_F26Dot6*     x,
                               FT_F26Dot6*     y,
-                              TT_GlyphZone    zone,
-                              FT_UShort*      refp )
+                              FT_Vector*      cur,
+                              FT_UInt*        refp )
   {
-    TT_GlyphZoneRec  zp;
-    FT_UShort        p;
-    FT_F26Dot6       d;
+    TT_GlyphZone  zp;
+    FT_UShort     p;
+    FT_F26Dot6    d;
 
 
     if ( exc->opcode & 1 )
     {
-      zp = exc->zp0;
+      zp = &exc->zp0;
       p  = exc->GS.rp1;
     }
     else
     {
-      zp = exc->zp1;
+      zp = &exc->zp1;
       p  = exc->GS.rp2;
     }
 
-    if ( BOUNDS( p, zp.n_points ) )
+    if ( BOUNDS( p, zp->n_points ) )
     {
       if ( exc->pedantic_hinting )
         exc->error = FT_THROW( Invalid_Reference );
-      *refp = 0;
       return FAILURE;
     }
 
-    *zone = zp;
-    *refp = p;
+    /* return reference if zones match */
+    if ( refp )
+      *refp = cur == zp->cur ? p
+                             : ~0U;  /* nan */
 
-    d = PROJECT( zp.cur + p, zp.org + p );
+    d = PROJECT( zp->cur + p, zp->org + p );
 
     *x = FT_MulFix( d, exc->moveVector.x );
     *y = FT_MulFix( d, exc->moveVector.y );
@@ -4965,10 +5023,9 @@
   /* See `ttinterp.h' for details on backward compatibility mode. */
   static void
   Move_Zp2_Point( TT_ExecContext  exc,
-                  FT_UShort       point,
+                  FT_UInt         point,
                   FT_F26Dot6      dx,
-                  FT_F26Dot6      dy,
-                  FT_Bool         touch )
+                  FT_F26Dot6      dy )
   {
     if ( exc->GS.freeVector.x != 0 )
     {
@@ -4978,8 +5035,7 @@
 #endif
         exc->zp2.cur[point].x = ADD_LONG( exc->zp2.cur[point].x, dx );
 
-      if ( touch )
-        exc->zp2.tags[point] |= FT_CURVE_TAG_TOUCH_X;
+      exc->zp2.tags[point] |= FT_CURVE_TAG_TOUCH_X;
     }
 
     if ( exc->GS.freeVector.y != 0 )
@@ -4990,8 +5046,7 @@
 #endif
         exc->zp2.cur[point].y = ADD_LONG( exc->zp2.cur[point].y, dy );
 
-      if ( touch )
-        exc->zp2.tags[point] |= FT_CURVE_TAG_TOUCH_Y;
+      exc->zp2.tags[point] |= FT_CURVE_TAG_TOUCH_Y;
     }
   }
 
@@ -5007,11 +5062,9 @@
            FT_Long*        args )
   {
     FT_Long          loop = exc->GS.loop;
-    TT_GlyphZoneRec  zp;
-    FT_UShort        refp;
 
     FT_F26Dot6       dx, dy;
-    FT_UShort        point;
+    FT_UInt          point;
 
 
     if ( exc->new_top < loop )
@@ -5023,12 +5076,12 @@
 
     exc->new_top -= loop;
 
-    if ( Compute_Point_Displacement( exc, &dx, &dy, &zp, &refp ) )
+    if ( Compute_Point_Displacement( exc, &dx, &dy, NULL, NULL ) )
       return;
 
     while ( loop-- )
     {
-      point = (FT_UShort)*(--args);
+      point = (FT_UInt)*(--args);
 
       if ( BOUNDS( point, exc->zp2.n_points ) )
       {
@@ -5039,7 +5092,7 @@
         }
       }
       else
-        Move_Zp2_Point( exc, point, dx, dy, TRUE );
+        Move_Zp2_Point( exc, point, dx, dy );
     }
 
   Fail:
@@ -5061,12 +5114,10 @@
   Ins_SHC( TT_ExecContext  exc,
            FT_Long*        args )
   {
-    TT_GlyphZoneRec  zp;
-    FT_UShort        refp;
+    FT_UInt          refp, start, limit, i;
     FT_F26Dot6       dx, dy;
 
     FT_UShort        contour, bounds;
-    FT_UShort        start, limit, i;
 
 
     contour = (FT_UShort)args[0];
@@ -5079,7 +5130,7 @@
       return;
     }
 
-    if ( Compute_Point_Displacement( exc, &dx, &dy, &zp, &refp ) )
+    if ( Compute_Point_Displacement( exc, &dx, &dy, exc->zp2.cur, &refp ) )
       return;
 
     if ( contour == 0 )
@@ -5095,8 +5146,8 @@
 
     for ( i = start; i < limit; i++ )
     {
-      if ( zp.cur != exc->zp2.cur || refp != i )
-        Move_Zp2_Point( exc, i, dx, dy, TRUE );
+      if ( refp != i )
+        Move_Zp2_Point( exc, i, dx, dy );
     }
   }
 
@@ -5111,40 +5162,59 @@
   Ins_SHZ( TT_ExecContext  exc,
            FT_Long*        args )
   {
-    TT_GlyphZoneRec  zp;
-    FT_UShort        refp;
-    FT_F26Dot6       dx,
-                     dy;
-
-    FT_UShort        limit, i;
+    FT_Vector*       cur;
+    FT_UInt          refp, i, limit;
+    FT_F26Dot6       dx, dy;
 
 
-    if ( BOUNDS( args[0], 2 ) )
+    /* XXX: UNDOCUMENTED! SHZ doesn't move the phantom points, */
+    /*      which must be subtracted.                          */
+    switch ( (FT_Int)args[0] )
     {
+    case 0:
+      cur   = exc->twilight.cur;
+      limit = exc->twilight.n_points;
+      break;
+
+    case 1:
+      cur   = exc->pts.cur;
+      limit = exc->pts.n_points > 4U ? exc->pts.n_points - 4U : 0;
+      break;
+
+    default:
       if ( exc->pedantic_hinting )
         exc->error = FT_THROW( Invalid_Reference );
       return;
     }
 
-    if ( Compute_Point_Displacement( exc, &dx, &dy, &zp, &refp ) )
+    if ( Compute_Point_Displacement( exc, &dx, &dy, cur, &refp ) )
       return;
 
-    /* XXX: UNDOCUMENTED! SHZ doesn't move the phantom points.     */
-    /*      Twilight zone has no real contours, so use `n_points'. */
-    /*      Normal zone's `n_points' includes phantoms, so must    */
-    /*      use end of last contour.                               */
-    if ( exc->GS.gep2 == 0 )
-      limit = exc->zp2.n_points;
-    else if ( exc->GS.gep2 == 1 && exc->zp2.n_contours > 0 )
-      limit = exc->zp2.contours[exc->zp2.n_contours - 1] + 1;
-    else
-      limit = 0;
+    /* XXX: UNDOCUMENTED! SHZ doesn't touch the points. */
+    if ( dx )
+    {
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      /* See `ttinterp.h' for details on backward compatibility mode. */
+      if ( !exc->backward_compatibility )
+#endif
+        for ( i = 0; i < limit; i++ )
+        {
+          if ( refp != i )
+            cur[i].x = ADD_LONG( cur[i].x, dx );
+        }
+    }
 
-    /* XXX: UNDOCUMENTED! SHZ doesn't touch the points */
-    for ( i = 0; i < limit; i++ )
+    if ( dy )
     {
-      if ( zp.cur != exc->zp2.cur || refp != i )
-        Move_Zp2_Point( exc, i, dx, dy, FALSE );
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      /* See `ttinterp.h' for details on backward compatibility mode. */
+      if ( exc->backward_compatibility != 0x7 )
+#endif
+        for ( i = 0; i < limit; i++ )
+        {
+          if ( refp != i )
+            cur[i].y = ADD_LONG( cur[i].y, dy );
+        }
     }
   }
 
@@ -5161,7 +5231,7 @@
   {
     FT_Long     loop = exc->GS.loop;
     FT_F26Dot6  dx, dy;
-    FT_UShort   point;
+    FT_UInt     point;
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
     FT_Bool     in_twilight = FT_BOOL( exc->GS.gep0 == 0 ||
                                        exc->GS.gep1 == 0 ||
@@ -5183,7 +5253,7 @@
 
     while ( loop-- )
     {
-      point = (FT_UShort)*(--args);
+      point = (FT_UInt)*(--args);
 
       if ( BOUNDS( point, exc->zp2.n_points ) )
       {
@@ -5206,11 +5276,11 @@
              ( exc->backward_compatibility != 0x7                     &&
                ( ( exc->is_composite && exc->GS.freeVector.y != 0 ) ||
                  ( exc->zp2.tags[point] & FT_CURVE_TAG_TOUCH_Y )    ) ) )
-          Move_Zp2_Point( exc, point, 0, dy, TRUE );
+          Move_Zp2_Point( exc, point, 0, dy );
       }
       else
 #endif
-        Move_Zp2_Point( exc, point, dx, dy, TRUE );
+        Move_Zp2_Point( exc, point, dx, dy );
     }
 
   Fail:
@@ -5293,7 +5363,12 @@
     if ( ( exc->opcode & 1 ) != 0 )
     {
       cur_dist = FAST_PROJECT( &exc->zp0.cur[point] );
-      distance = SUB_LONG( exc->func_round( exc, cur_dist, 0 ), cur_dist );
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      if ( exc->native_cleartype_x )
+        distance = 0;
+      else
+#endif
+        distance = SUB_LONG( exc->func_round( exc, cur_dist, 0 ), cur_dist );
     }
     else
       distance = 0;
@@ -5371,6 +5446,13 @@
       FT_F26Dot6  delta;
 
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      /* Native ClearType reduces CVT cut-in to 1/16 in the */
+      /* ClearType direction.                               */
+      if ( exc->native_cleartype_x )
+        control_value_cutin >>= 4;
+#endif
+
       delta = SUB_LONG( distance, org_dist );
       if ( delta < 0 )
         delta = NEG_LONG( delta );
@@ -5378,7 +5460,10 @@
       if ( delta > control_value_cutin )
         distance = org_dist;
 
-      distance = exc->func_round( exc, distance, 0 );
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      if ( !exc->native_cleartype_x )
+#endif
+        distance = exc->func_round( exc, distance, 0 );
     }
 
     exc->func_move( exc, &exc->zp0, point, SUB_LONG( distance, org_dist ) );
@@ -5472,7 +5557,14 @@
     compensation = exc->GS.compensation[exc->opcode & 3];
 
     if ( ( exc->opcode & 4 ) != 0 )
-      distance = exc->func_round( exc, org_dist, compensation );
+    {
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      if ( exc->native_cleartype_x )
+        distance = Round_None( exc, org_dist, compensation );
+      else
+#endif
+        distance = exc->func_round( exc, org_dist, compensation );
+    }
     else
       distance = Round_None( exc, org_dist, compensation );
 
@@ -5483,6 +5575,13 @@
       FT_F26Dot6  minimum_distance = exc->GS.minimum_distance;
 
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      /* Native ClearType reduces minimum distance to 1/2 in the */
+      /* ClearType direction.                                    */
+      if ( exc->native_cleartype_x )
+        minimum_distance >>= 1;
+#endif
+
       if ( org_dist >= 0 )
       {
         if ( distance < minimum_distance )
@@ -5605,6 +5704,13 @@
         FT_F26Dot6  control_value_cutin = exc->GS.control_value_cutin;
 
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+        /* Native ClearType reduces CVT cut-in to 1/16 in the */
+        /* ClearType direction.                               */
+        if ( exc->native_cleartype_x )
+          control_value_cutin >>= 4;
+#endif
+
         /* XXX: According to Greg Hitchcock, the following wording is */
         /*      the right one:                                        */
         /*                                                            */
@@ -5625,7 +5731,12 @@
           cvt_dist = org_dist;
       }
 
-      distance = exc->func_round( exc, cvt_dist, compensation );
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      if ( exc->native_cleartype_x )
+        distance = Round_None( exc, cvt_dist, compensation );
+      else
+#endif
+        distance = exc->func_round( exc, cvt_dist, compensation );
     }
     else
       distance = Round_None( exc, cvt_dist, compensation );
@@ -5637,6 +5748,13 @@
       FT_F26Dot6  minimum_distance = exc->GS.minimum_distance;
 
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+      /* Native ClearType reduces minimum distance to 1/2 in the */
+      /* ClearType direction.                                    */
+      if ( exc->native_cleartype_x )
+        minimum_distance >>= 1;
+#endif
+
       if ( org_dist >= 0 )
       {
         if ( distance < minimum_distance )
@@ -6191,14 +6309,14 @@
     IUP_WorkerRec  V;
     FT_Byte        mask;
 
-    FT_UInt   first_point;   /* first point of contour        */
-    FT_UInt   end_point;     /* end point (last+1) of contour */
+    FT_UInt  first_point;   /* first point of contour        */
+    FT_UInt  end_point;     /* end point (last+1) of contour */
 
-    FT_UInt   first_touched; /* first touched point in contour   */
-    FT_UInt   cur_touched;   /* current touched point in contour */
+    FT_UInt  first_touched; /* first touched point in contour   */
+    FT_UInt  cur_touched;   /* current touched point in contour */
 
-    FT_UInt   point;         /* current point   */
-    FT_Short  contour;       /* current contour */
+    FT_UInt  point;         /* current point   */
+    FT_UInt  contour;       /* current contour */
 
 
 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
@@ -6566,11 +6684,23 @@
        * Selector Bit:  11
        * Return Bit(s): 18
        *
-       * The only smoothing method FreeType supports unless someone sets
-       * FT_LOAD_TARGET_MONO.
+       * Report the smoothing mode selected by the DirectWrite-style
+       * ClearType policy for this face and PPEM.
        */
-      if ( ( args[0] & 2048 ) != 0 && exc->mode != FT_RENDER_MODE_MONO )
-        K |= 1 << 18;
+      if ( ( args[0] & 2048 ) != 0          &&
+           exc->mode != FT_RENDER_MODE_MONO )
+      {
+        FT_Bool  symmetric_smoothing;
+
+
+        tt_face_get_cleartype_policy( exc->face,
+                                      exc->metrics.y_ppem,
+                                      &symmetric_smoothing,
+                                      NULL );
+
+        if ( symmetric_smoothing )
+          K |= 1 << 18;
+      }
 
       /*********************************
        * CLEARTYPE HINTING AND
@@ -7339,56 +7469,11 @@
       }
 
       if ( exc->error )
-      {
-        switch ( exc->error )
-        {
-        case FT_ERR( Invalid_Opcode ):
-          {
-            TT_DefRecord*  def   = exc->IDefs;
-            TT_DefRecord*  limit = FT_OFFSET( def, exc->numIDefs );
-
-
-            /* looking for redefined instructions */
-            for ( ; def < limit; def++ )
-            {
-              if ( def->active && exc->opcode == (FT_Byte)def->opc )
-              {
-                TT_CallRec*  callrec;
-
-
-                if ( exc->callTop >= exc->callSize )
-                {
-                  exc->error = FT_THROW( Invalid_Reference );
-                  goto LErrorLabel_;
-                }
-
-                callrec = &exc->callStack[exc->callTop];
-
-                callrec->Caller_Range = exc->curRange;
-                callrec->Caller_IP    = exc->IP + 1;
-                callrec->Cur_Count    = 1;
-                callrec->Def          = def;
-
-                if ( Ins_Goto_CodeRange( exc,
-                                         def->range,
-                                         def->start ) == FAILURE )
-                  goto LErrorLabel_;
-
-                goto LSuiteLabel_;
-              }
-            }
-          }
-          FALL_THROUGH;
-
-        default:
-          goto LErrorLabel_;
-        }
-      }
+        goto LErrorLabel_;
 
       exc->top = exc->new_top;
       exc->IP += exc->length;
 
-    LSuiteLabel_:
       if ( exc->IP >= exc->codeSize )
       {
         if ( exc->callTop > 0 )
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h	2026-11-15 23:20:43.000000000 +0000
@@ -378,6 +378,14 @@
      *
      */
 
+    /*
+     * Native ClearType horizontal execution state.  Microsoft ClearType
+     * uses a 1/16-pixel grid in the ClearType direction; version 40
+     * approximates this by leaving rounded horizontal point moves
+     * unrounded.
+     */
+    FT_Bool  native_cleartype_x;
+
     /* Activate backward compatibility (bit 2) and track IUP (bits 0-1). */
     /* If this is zero, it means that the interpreter is either in v35   */
     /* or in native ClearType mode.                                      */
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c	2026-11-15 23:20:43.000000000 +0000
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "ttgload.h"
 #include "ttpload.h"
@@ -852,11 +853,74 @@
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
     tt_done_blend( ttface );
-    face->blend = NULL;
 #endif
   }
 
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+
+  FT_LOCAL_DEF( void )
+  tt_face_get_cleartype_policy( TT_Face   face,
+                                FT_UInt   ppem,
+                                FT_Bool*  symmetric_smoothing,
+                                FT_Bool*  grid_fit )
+  {
+    FT_Bool    symmetric;
+    FT_Bool    fit;
+    FT_Bool    found = FALSE;
+    FT_UShort  flags = 0;
+    FT_UInt    i;
+
+
+    /*
+     * DirectWrite fallback for hinted fonts without an applicable
+     * version-1 ClearType 'gasp' range:
+     *
+     *   <= 20 ppem  NATURAL
+     *   >  20 ppem  NATURAL_SYMMETRIC
+     *
+     * Fonts without glyph bytecode use symmetric rendering.
+     *
+     * `maxSizeOfInstructions` is also what Skia uses to determine
+     * whether a TrueType face is hinted for this DirectWrite policy.
+     */
+    fit = FT_BOOL( face->max_profile.maxSizeOfInstructions != 0 );
+
+    symmetric = FT_BOOL( !fit || ppem > 20 );
+
+    /*
+     * A valid version-1 `gasp' range explicitly controls the two
+     * independent ClearType properties.
+     */
+    if ( face->gasp.version >= 1 )
+    {
+      for ( i = 0; i < face->gasp.numRanges; i++ )
+      {
+        if ( ppem <= face->gasp.gaspRanges[i].maxPPEM )
+        {
+          flags = face->gasp.gaspRanges[i].gaspFlag;
+          found = TRUE;
+          break;
+        }
+      }
+
+      if ( found )
+      {
+        symmetric = FT_BOOL( flags & FT_GASP_SYMMETRIC_SMOOTHING );
+        fit       = FT_BOOL( flags & FT_GASP_SYMMETRIC_GRIDFIT );
+      }
+    }
+
+    if ( symmetric_smoothing )
+      *symmetric_smoothing = symmetric;
+
+    if ( grid_fit )
+      *grid_fit = fit;
+  }
+
+#endif
+
+
   /**************************************************************************
    *
    *                          SIZE  FUNCTIONS
@@ -909,15 +973,15 @@
       error = TT_Run_Context( exec, size );
       FT_TRACE4(( error ? "  failed (error code 0x%x)\n" : "",
                   error ));
+
+      if ( !error )
+        TT_Save_Context( exec, size );
     }
     else
       error = FT_Err_Ok;
 
     size->bytecode_ready = error;
 
-    if ( !error )
-      TT_Save_Context( exec, size );
-
     return error;
   }
 
@@ -990,15 +1054,15 @@
       error = TT_Run_Context( exec, size );
       FT_TRACE4(( error ? "  failed (error code 0x%x)\n" : "",
                   error ));
+
+      if ( !error )
+        TT_Save_Context( exec, size );
     }
     else
       error = FT_Err_Ok;
 
     size->cvt_ready = error;
 
-    if ( !error )
-      TT_Save_Context( exec, size );
-
     return error;
   }
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h	2026-11-15 23:20:43.000000000 +0000
@@ -325,6 +325,22 @@
   tt_slot_init( FT_GlyphSlot  slot );
 
 
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+
+  /*
+   * Return the DirectWrite-style ClearType policy for a face and PPEM.
+   *
+   * Either output pointer may be NULL.
+   */
+  FT_LOCAL( void )
+  tt_face_get_cleartype_policy( TT_Face   face,
+                                FT_UInt   ppem,
+                                FT_Bool*  symmetric_smoothing,
+                                FT_Bool*  grid_fit );
+
+#endif
+
+
   /* auxiliary */
 #define IS_HINTED( flags )  ( ( flags & FT_LOAD_NO_HINTING ) == 0 )
 
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c	2026-11-15 23:20:43.000000000 +0000
@@ -69,7 +69,11 @@
 
 
     /* we need the size of the `glyf' table for malformed `loca' tables */
-    error = face->goto_table( face, TTAG_glyf, stream, &face->glyf_len );
+    error = face->goto_table( face,
+                              face->is_extended_glyf ? TTAG_GLYF
+                                                     : TTAG_glyf,
+                              stream,
+                              &face->glyf_len );
 
     /* it is possible that a font doesn't have a glyf table at all */
     /* or its size is zero                                         */
@@ -91,7 +95,11 @@
     }
 
     FT_TRACE2(( "Locations " ));
-    error = face->goto_table( face, TTAG_loca, stream, &table_len );
+    error = face->goto_table( face,
+                              face->is_extended_glyf ? TTAG_LOCA
+                                                     : TTAG_loca,
+                              stream,
+                              &table_len );
     if ( error )
     {
       error = FT_THROW( Locations_Missing );
@@ -100,7 +108,8 @@
 
     shift = face->header.Index_To_Loc_Format != 0 ? 2 : 1;
 
-    if ( table_len > 0x10000UL << shift )
+    if ( !face->is_extended_glyf        &&
+         table_len > 0x10000UL << shift )
     {
       FT_TRACE2(( "table too large\n" ));
       table_len = 0x10000UL << shift;
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/type1/t1load.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/type1/t1load.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/type1/t1load.c	2026-11-15 23:20:43.000000000 +0000
@@ -677,7 +677,7 @@
     PS_Blend  blend  = t1face->blend;
 
     FT_Fixed  axiscoords[4];
-    FT_UInt   i, nc;
+    FT_UInt   i;
 
 
     if ( !blend )
@@ -687,19 +687,18 @@
                       axiscoords,
                       blend->num_axis );
 
-    nc = num_coords;
     if ( num_coords > blend->num_axis )
     {
       FT_TRACE2(( "T1_Get_Var_Design:"
                   " only using first %u of %u coordinates\n",
                   blend->num_axis, num_coords ));
-      nc = blend->num_axis;
+
+      FT_ARRAY_ZERO( coords + blend->num_axis, num_coords - blend->num_axis );
+      num_coords = blend->num_axis;
     }
 
-    for ( i = 0; i < nc; i++ )
+    for ( i = 0; i < num_coords; i++ )
       coords[i] = mm_axis_unmap( &blend->design_map[i], axiscoords[i] );
-    for ( ; i < num_coords; i++ )
-      coords[i] = 0;
 
     return FT_Err_Ok;
   }
diff -Nru openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
--- openjdk-21-21.0.13+9/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c	2026-11-15 23:20:43.000000000 +0000
@@ -268,33 +268,34 @@
 
     if ( parser->in_pfb )
     {
-      /* in the case of the PFB format, the private dictionary can be  */
-      /* made of several segments.  We thus first read the number of   */
-      /* segments to compute the total size of the private dictionary  */
-      /* then re-read them into memory.                                */
-      FT_ULong   start_pos = FT_STREAM_POS();
+      /* in the case of the PFB format, the private dictionary can be */
+      /* made of several adjacent segments.                           */
       FT_UShort  tag;
+      FT_Byte*   priv_dict = NULL;
+      FT_ULong   priv_len  = 0;
 
 
-      parser->private_len = 0;
       for (;;)
       {
         error = read_pfb_tag( stream, &tag, &size );
         if ( error )
-          goto Fail;
+          break;
 
-        if ( tag != 0x8002U )
+        if ( tag != 0x8002U || size > stream->size - stream->pos )
           break;
 
-        parser->private_len += size;
+        if ( FT_QREALLOC( priv_dict, priv_len, priv_len + size ) ||
+             FT_STREAM_READ( priv_dict + priv_len, size )        )
+          break;
 
-        if ( FT_STREAM_SKIP( size ) )
-          goto Fail;
+        priv_len += size;
       }
 
+      parser->private_dict = priv_dict;
+      parser->private_len  = priv_len;
+
       /* Check that we have a private dictionary there */
-      /* and allocate private dictionary buffer        */
-      if ( parser->private_len == 0 )
+      if ( priv_len == 0 )
       {
         FT_ERROR(( "T1_Get_Private_Dict:"
                    " invalid private dictionary section\n" ));
@@ -302,26 +303,8 @@
         goto Fail;
       }
 
-      if ( FT_STREAM_SEEK( start_pos )                            ||
-           FT_QALLOC( parser->private_dict, parser->private_len ) )
-        goto Fail;
-
-      parser->private_len = 0;
-      for (;;)
-      {
-        error = read_pfb_tag( stream, &tag, &size );
-        if ( error || tag != 0x8002U )
-        {
-          error = FT_Err_Ok;
-          break;
-        }
-
-        if ( FT_STREAM_READ( parser->private_dict + parser->private_len,
-                             size ) )
-          goto Fail;
-
-        parser->private_len += size;
-      }
+      /* discard any errors from truncated files */
+      error = FT_Err_Ok;
     }
     else
     {
@@ -339,11 +322,8 @@
       FT_Bool     test_cr;
 
 
-      parser->root.cursor = parser->base_dict;
-      parser->root.limit  = parser->base_dict + parser->base_len;
-
-      cur   = parser->root.cursor;
-      limit = parser->root.limit;
+      parser->root.cursor = cur;
+      parser->root.limit  = limit;
 
       while ( cur < limit )
       {
diff -Nru openjdk-21-21.0.13+9/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java openjdk-21-21.0.13.1+2/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
--- openjdk-21-21.0.13+9/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java	2026-11-15 23:20:43.000000000 +0000
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidObjectException;
+import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.io.Serializable;
@@ -1846,6 +1847,79 @@
         return (RMIServer) objref;
     }
 
+    /**
+     * ObjectInputFilter implementation for JMXServiceURL.
+     * Optional filters may be set from the env and System Property.
+     * If not decisive, the default filter is checked.
+     */
+    private static final class JMXURLObjectInputFilter implements ObjectInputFilter {
+
+        // Default filter.  Intentionally does NOT end in "!*", to leave some classes UNDECIDED.
+        private static final String DEFAULT_URL_FILTER_PATTERN =
+            // Permit proxy classes including older style jdk.proxy1.$Proxy0
+            "java.lang.reflect.Proxy;" +
+            "java.rmi.server.RemoteObjectInvocationHandler;" +
+            "jdk.proxy*;" +
+            "java.rmi.server.RemoteStub;" +
+            "java.rmi.server.RemoteObject;" +
+            "javax.management.remote.rmi.RMIServerImpl_Stub;";
+
+        private static final String URL_FILTER_OVERRIDE_PATTERN_NAME = "jmx.remote.rmi.connector.url.filter.pattern";
+
+        private final ObjectInputFilter envFilter;
+
+        private final ObjectInputFilter systemPropertyFilter;
+
+        private final ObjectInputFilter defaultFilter;
+
+        private static ObjectInputFilter filterFromPattern(String pattern) {
+            // createFilter returns null on empty pattern (pattern must not be null)
+            return ObjectInputFilter.Config.createFilter(pattern != null ? pattern : "");
+        }
+
+        @SuppressWarnings("removal")
+        public JMXURLObjectInputFilter(Map env) {
+            envFilter = filterFromPattern((String) env.get(URL_FILTER_OVERRIDE_PATTERN_NAME));
+            systemPropertyFilter = filterFromPattern(
+                    AccessController.doPrivileged((PrivilegedAction) () -> {
+                        return System.getProperty(URL_FILTER_OVERRIDE_PATTERN_NAME);
+            }));
+            defaultFilter = ObjectInputFilter.Config.createFilter(DEFAULT_URL_FILTER_PATTERN);
+        }
+
+        @Override
+        public Status checkInput(FilterInfo info) {
+            Status status = Status.UNDECIDED;
+            // Check custom filters, if set.  Try next filter if UNDECIDED.
+            if (envFilter != null) {
+                status = envFilter.checkInput(info);
+                if (status != Status.UNDECIDED) {
+                    return status;
+                }
+            }
+            if (systemPropertyFilter != null) {
+                status = systemPropertyFilter.checkInput(info);
+                if (status != Status.UNDECIDED) {
+                    return status;
+                }
+            }
+            status = defaultFilter.checkInput(info);
+            if (status != Status.UNDECIDED) {
+                return status;
+            }
+            // Finally, permit client socket factory or RMIServer, to avoid requiring an exhaustive filter.
+            // Otherwise, return REJECTED.
+            Class c = info.serialClass();
+            if (RMIClientSocketFactory.class.isAssignableFrom(c)
+                || RMIServer.class.isAssignableFrom(c)) {
+                return Status.ALLOWED;
+            } else {
+                return Status.REJECTED;
+            }
+        }
+    }
+
+    @SuppressWarnings("removal")
     private RMIServer findRMIServerJRMP(String base64, Map env)
         throws IOException {
         final byte[] serialized;
@@ -1862,13 +1936,20 @@
                 (loader == null) ?
                     new ObjectInputStream(bin) :
                     new ObjectInputStreamWithLoader(bin, loader);
+
+        final JMXURLObjectInputFilter filter = new JMXURLObjectInputFilter(env);
+        AccessController.doPrivileged((PrivilegedAction) () -> {
+            oin.setObjectInputFilter(filter);
+            return null;
+        });
+
         final Object stub;
         try {
             stub = oin.readObject();
         } catch (ClassNotFoundException e) {
             throw new MalformedURLException("Class not found: " + e);
         }
-        return (RMIServer)stub;
+        return (RMIServer) stub;
     }
 
     private static final class ObjectInputStreamWithLoader
diff -Nru openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java
--- openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/KrbApReq.java	2026-11-15 23:20:43.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,15 @@
 import java.net.InetAddress;
 import sun.security.util.*;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
 import sun.security.krb5.internal.rcache.AuthTimeWithHash;
 
 /**
@@ -340,12 +346,52 @@
             }
         }
 
-        // XXX check for repeated authenticator
-        // if found
-        //    throw new KrbApErrException(Krb5.KRB_AP_ERR_REPEAT);
-        // else
-        //    save authenticator to check for later
+        if (DEBUG) {
+            System.out.println(">>> KrbApReq: Received ticket options " + enc_ticketPart.flags);
+        }
 
+        if (!enc_ticketPart.flags.get(Krb5.TKT_OPTS_TRANSIT_POLICY_CHECKED)
+                && enc_ticketPart.transited.contents.length != 0) {
+            // System property to control transited policy check:
+            //
+            // If true, compare transited field inside the service ticket to
+            // local settings, and fail with KRB_AP_PATH_NOT_ACCEPTED if there
+            // is no match. Otherwise, ignore the check.
+            //
+            // Default value is `true`. Set to `false` to revert to old behavior.
+            String propValue = SecurityProperties.privilegedGetOverridable(
+                    "sun.security.krb5.acceptor.checkTransitedPolicy");
+            if (propValue != null) {
+                propValue = propValue.toLowerCase(Locale.ROOT);
+            }
+            boolean checkTransitedPolicy = switch (propValue) {
+                case null -> true;
+                case "true" -> true;
+                case "false" -> false;
+                default -> throw new IllegalArgumentException(
+                        "Invalid property value: " + propValue);
+            };
+            if (checkTransitedPolicy) {
+                if (enc_ticketPart.transited.trType == Krb5.DOMAIN_X500_COMPRESS) {
+                    String transited = new String(
+                            enc_ticketPart.transited.contents, StandardCharsets.UTF_8);
+                    String cRealm = enc_ticketPart.cname.getRealmAsString();
+                    String sRealm = apReqMessg.ticket.sname.getRealmAsString();
+                    String[] allowed = Realm.getRealmsList(cRealm, sRealm);
+                    if (DEBUG) {
+                        System.out.println(">>> KrbApReq: transited realm is " + transited
+                                + ", allowed is " + Arrays.toString(allowed)
+                                + ". Checking from " + cRealm + " to " + sRealm);
+                    }
+                    List inTicket = parseTransited(transited);
+                    if (!Set.of(allowed).containsAll(inTicket)) {
+                        throw new KrbApErrException(Krb5.KRB_AP_PATH_NOT_ACCEPTED);
+                    }
+                } else {
+                    throw new KrbApErrException(Krb5.KRB_AP_PATH_NOT_ACCEPTED);
+                }
+            }
+        }
         KerberosTime now = KerberosTime.now();
 
         if ((enc_ticketPart.starttime != null &&
@@ -379,6 +425,29 @@
         }
     }
 
+    // https://datatracker.ietf.org/doc/html/rfc4120#section-3.3.3.2
+    // Only support "," and "." as special characters.
+    private static List parseTransited(String input)
+            throws KrbApErrException {
+        ArrayList output = new ArrayList<>();
+        String last = null;
+        for (String s : input.split(",", -1)) {
+            if (s == null || s.isEmpty() || s.contains("/")
+                    || s.contains("\\") || s.contains(" ")) {
+                throw new KrbApErrException(Krb5.KRB_AP_PATH_NOT_ACCEPTED);
+            }
+            if (s.endsWith(".")) {
+                if (last == null) {
+                    throw new KrbApErrException(Krb5.KRB_AP_PATH_NOT_ACCEPTED);
+                }
+                s = s + last;
+            }
+            output.add(s);
+            last = s;
+        }
+        return output;
+    }
+
     /**
      * Returns the credentials that are contained in the ticket that
      * is part of this AP-REQ.
diff -Nru openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java
--- openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java	2026-11-15 23:20:43.000000000 +0000
@@ -451,8 +451,7 @@
             Credentials newTgt = getTGTforRealm(tgtRealm, serviceRealm,
                     asCreds, okAsDelegate);
             if (newTgt == null) {
-                throw new KrbApErrException(Krb5.KRB_AP_ERR_GEN_CRED,
-                        "No service creds");
+                throw new KrbException("No service creds");
             }
             if (DEBUG) {
                 System.out.println(">>> Cross-realm TGT Credentials" +
diff -Nru openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java
--- openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java	2026-11-15 23:20:43.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,7 @@
     public static final int TKT_OPTS_INITIAL      = 9;
     public static final int TKT_OPTS_PRE_AUTHENT  = 10;
     public static final int TKT_OPTS_HW_AUTHENT   = 11;
+    public static final int TKT_OPTS_TRANSIT_POLICY_CHECKED   = 12;
     public static final int TKT_OPTS_DELEGATE     = 13;
     public static final int TKT_OPTS_ENC_PA_REP   = 15;
     public static final int TKT_OPTS_MAX          = 31;
@@ -250,6 +251,9 @@
     public static final int KDC_ERR_KEY_EXPIRED          = 23;   //Password has expired - change password to reset
     public static final int KDC_ERR_PREAUTH_FAILED       = 24;   //Pre-authentication information was invalid
     public static final int KDC_ERR_PREAUTH_REQUIRED     = 25;   //Additional pre-authentication required
+    public static final int KDC_ERR_SERVER_NOMATCH       = 26;   //Requested server and ticket don't match
+    public static final int KDC_ERR_MUST_USE_USER2USER   = 27;   //Server principal valid for user2user only
+    public static final int KDC_ERR_PATH_NOT_ACCEPTED    = 28;   //KDC Policy rejects transited path
     public static final int KDC_ERR_SVC_UNAVAILABLE      = 29;   //A service is not available
     public static final int KRB_AP_ERR_BAD_INTEGRITY     = 31;   //Integrity check on decrypted field failed
     public static final int KRB_AP_ERR_TKT_EXPIRED       = 32;   //Ticket expired
@@ -270,13 +274,13 @@
     public static final int KRB_AP_ERR_METHOD            = 48;   //Alternative authentication method required
     public static final int KRB_AP_ERR_BADSEQ            = 49;   //Incorrect sequence number in message
     public static final int KRB_AP_ERR_INAPP_CKSUM       = 50;   //Inappropriate type of checksum in message
+    public static final int KRB_AP_PATH_NOT_ACCEPTED     = 51;   //Policy rejects transited path
     public static final int KRB_ERR_RESPONSE_TOO_BIG     = 52;   //Response too big for UDP, retry with TCP
     public static final int KRB_ERR_GENERIC              = 60;   //Generic error (description in e-text)
     public static final int KRB_ERR_FIELD_TOOLONG        = 61;   //Field is too long for this implementation
     public static final int KRB_ERR_WRONG_REALM          = 68;   //Wrong realm
-    public static final int KRB_CRYPTO_NOT_SUPPORT      = 100;    //Client does not support this crypto type
-    public static final int KRB_AP_ERR_NOREALM          = 62;
-    public static final int KRB_AP_ERR_GEN_CRED         = 63;
+
+    public static final int KRB_CRYPTO_NOT_SUPPORT      = 100;   //Client does not support this crypto type
     //  public static final int KRB_AP_ERR_CKSUM_NOKEY          =101;    //Lack of the key to generate the checksum
     // error codes specific to this implementation
     public static final int KRB_AP_ERR_REQ_OPTIONS = 101; //Invalid TGS_REQ
@@ -343,6 +347,10 @@
         errMsgList.put(KDC_ERR_KEY_EXPIRED, "Password has expired - change password to reset");
         errMsgList.put(KDC_ERR_PREAUTH_FAILED, "Pre-authentication information was invalid");
         errMsgList.put(KDC_ERR_PREAUTH_REQUIRED, "Additional pre-authentication required");
+        errMsgList.put(KDC_ERR_SERVER_NOMATCH, "Requested server and ticket don't match");
+        errMsgList.put(KDC_ERR_MUST_USE_USER2USER, "Server principal valid for user2user only");
+        errMsgList.put(KDC_ERR_PATH_NOT_ACCEPTED, "KDC Policy rejects transited path");
+        errMsgList.put(KDC_ERR_SVC_UNAVAILABLE, "A service is not available");
         errMsgList.put(KRB_AP_ERR_BAD_INTEGRITY, "Integrity check on decrypted field failed");
         errMsgList.put(KRB_AP_ERR_TKT_EXPIRED, "Ticket expired");
         errMsgList.put(KRB_AP_ERR_TKT_NYV, "Ticket not yet valid");
@@ -362,10 +370,11 @@
         errMsgList.put(KRB_AP_ERR_METHOD, "Alternative authentication method required");
         errMsgList.put(KRB_AP_ERR_BADSEQ, "Incorrect sequence number in message");
         errMsgList.put(KRB_AP_ERR_INAPP_CKSUM, "Inappropriate type of checksum in message");
+        errMsgList.put(KRB_AP_PATH_NOT_ACCEPTED, "Policy rejects transited path");
         errMsgList.put(KRB_ERR_RESPONSE_TOO_BIG, "Response too big for UDP, retry with TCP");
         errMsgList.put(KRB_ERR_GENERIC, "Generic error (description in e-text)");
         errMsgList.put(KRB_ERR_FIELD_TOOLONG, "Field is too long for this implementation");
-        errMsgList.put(KRB_AP_ERR_NOREALM, "Realm name not available"); //used in setDefaultCreds() in sun.security.krb5.Credentials
+        errMsgList.put(KRB_ERR_WRONG_REALM, "Wrong realm");
 
         // error messages specific to this implementation
 
@@ -395,7 +404,6 @@
         errMsgList.put(ASN1_CANNOT_ENCODE, "Encoding failed due to invalid parameter(s)");
         errMsgList.put(KRB_CRYPTO_NOT_SUPPORT, "Client has no support for crypto type");
         errMsgList.put(KRB_AP_ERR_REQ_OPTIONS, "Invalid option setting in ticket request.");
-        errMsgList.put(KRB_AP_ERR_GEN_CRED, "Fail to create credential.");
     }
 
 }
diff -Nru openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java
--- openjdk-21-21.0.13+9/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java	2026-11-15 23:20:43.000000000 +0000
@@ -52,6 +52,8 @@
  *                   initial(9),
  *                   pre-authent(10),
  *                   hw-authent(11),
+ *                   transited-policy-checked(12),
+ *                   ok-as-delegate(13)
  *                   enc-pa-rep(15)
  *                  }
  */
@@ -180,9 +182,18 @@
                 case 11:
                     sb.append("HW-AUTHENT;");
                     break;
+                case 12:
+                    sb.append("TRANSIT-POLICY-CHECKED;");
+                    break;
+                case 13:
+                    sb.append("OK-AS-DELEGATE;");
+                    break;
                 case 15:
                     sb.append("ENC-PA-REP;");
                     break;
+                default:
+                    sb.append(i).append(";");
+                    break;
                 }
             }
         }
diff -Nru openjdk-21-21.0.13+9/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java openjdk-21-21.0.13.1+2/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java
--- openjdk-21-21.0.13+9/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java	2026-11-15 23:20:43.000000000 +0000
@@ -270,107 +270,23 @@
      */
     /*package-private*/
     @ForceInline
-    void checkIndexByLane(int offset, int length,
-                          Vector iota,
-                          int esize) {
-        if (VectorIntrinsics.VECTOR_ACCESS_OOB_CHECK == 0) {
-            return;
-        }
-        // Although the specification is simple, the implementation is
-        // tricky, because the value iota*esize might possibly
-        // overflow.  So we calculate our test values as scalars,
-        // clipping to the range [-1..VLENGTH], and test them against
-        // the unscaled iota vector, whose values are in [0..VLENGTH-1].
-        int vlength = length();
-        VectorMask badMask;
-        if (esize == 1) {
-            badMask = checkIndex0(offset, length, iota, vlength);
-        } else if (offset >= 0) {
-            // Masked access to multi-byte lanes in byte array.
-            // It could be aligned anywhere.
-            int elemCount = Math.min(vlength, (length - offset) / esize);
-            badMask = checkIndex0(0, elemCount, iota, vlength);
-        } else {
-            int clipOffset = Math.max(offset, -(vlength * esize));
-            badMask = checkIndex0(clipOffset, length,
-                                  iota.lanewise(VectorOperators.MUL, esize),
-                                  vlength * esize);
-        }
-        badMask = badMask.and(this);
-        if (badMask.anyTrue()) {
-            int badLane = badMask.firstTrue();
-            throw ((AbstractMask)badMask)
-                   .checkIndexFailed(offset, badLane, length, esize);
-        }
-    }
-
-    private
-    @ForceInline
-    VectorMask checkIndex0(int offset, int length,
-                              Vector iota, int vlength) {
-        // An active lane is bad if its number is greater than
-        // length-offset, since when added to offset it will step off
-        // of the end of the array.  To avoid overflow when
-        // converting, clip the comparison value to [0..vlength]
-        // inclusive.
-        int indexLimit = Math.max(0, Math.min(length - offset, vlength));
-        VectorMask badMask =
-            iota.compare(GE, iota.broadcast(indexLimit));
-        if (offset < 0) {
-            // An active lane is bad if its number is less than
-            // -offset, because when added to offset it will then
-            // address an array element at a negative index.  To avoid
-            // overflow when converting, clip the comparison value at
-            // vlength.  This specific expression works correctly even
-            // when offset is Integer.MIN_VALUE.
-            int firstGoodIndex = -Math.max(offset, -vlength);
-            VectorMask badMask2 =
-                iota.compare(LT, iota.broadcast(firstGoodIndex));
-            if (indexLimit >= vlength) {
-                badMask = badMask2;  // 1st badMask is all true
-            } else {
-                badMask = badMask.or(badMask2);
-            }
-        }
-        return badMask;
-    }
-
-    /**
-     * Test if a masked memory access at a given offset into an array
-     * of the given length will stay within the array.
-     * The per-lane offsets are iota*esize.
-     */
-    /*package-private*/
-    @ForceInline
     void checkIndexByLane(long offset, long length,
                           Vector iota,
                           int esize) {
         if (VectorIntrinsics.VECTOR_ACCESS_OOB_CHECK == 0) {
             return;
         }
-        // Although the specification is simple, the implementation is
-        // tricky, because the value iota*esize might possibly
-        // overflow.  So we calculate our test values as scalars,
-        // clipping to the range [-1..VLENGTH], and test them against
-        // the unscaled iota vector, whose values are in [0..VLENGTH-1].
+        assert length >= 0;
         int vlength = length();
-        VectorMask badMask;
-        if (esize == 1) {
-            badMask = checkIndex0(offset, length, iota, vlength);
-        } else if (offset >= 0) {
-            // Masked access to multi-byte lanes in byte array.
-            // It could be aligned anywhere.
-            // 0 <= elemCount <= vlength
-            int elemCount = (int) Math.min(vlength, (length - offset) / esize);
-            badMask = checkIndex0(0, elemCount, iota, vlength);
-        } else {
-            // -vlength * esize <= clipOffset <= 0
-            int clipOffset = (int) Math.max(offset, -(vlength * esize));
-            badMask = checkIndex0(clipOffset, length,
-                    iota.lanewise(VectorOperators.MUL, esize),
-                    vlength * esize);
-        }
+        // badMask marks lanes that are not valid, i.e. fall outside
+        // the segment.
+
+        // The implementation assumes that iota*esize will not overflow.
+        VectorMask badMask = checkIndex0(offset, length - esize + 1,
+                iota.lanewise(VectorOperators.MUL, esize),
+                vlength * esize);
         badMask = badMask.and(this);
+        // if any active lanes fall outside, throw.
         if (badMask.anyTrue()) {
             int badLane = badMask.firstTrue();
             throw ((AbstractMask)badMask)
@@ -381,34 +297,67 @@
     private
     @ForceInline
     VectorMask checkIndex0(long offset, long length,
-                              Vector iota, int vlength) {
-        // An active lane is bad if its number is greater than
-        // length-offset, since when added to offset it will step off
-        // of the end of the array.  To avoid overflow when
-        // converting, clip the comparison value to [0..vlength]
-        // inclusive.
-        // 0 <= indexLimit <= vlength
-        int indexLimit = (int) Math.max(0, Math.min(length - offset, vlength));
-        VectorMask badMask =
-                iota.compare(GE, iota.broadcast(indexLimit));
+                              Vector iotaScaled, int vlengthScaled) {
+        // This method takes:
+        // - vector length scaled by esize (vlengthScaled)
+        // - vector of lane offsets for the given vector type
+        //   with values (0, esize, 2 * esize, ..., vlengthScaled - esize) (iotaScaled)
+        // - an offset into the segment at which the access
+        //   will take place (offset)
+        // - the length of the segment, reduced by esize - 1 (length)
+        // Returns a mask where bad lanes are set to true
+        // and good lanes are set to false.
+        // Bad lanes are defined as lanes whose offset falls below 0
+        // or above length.
+        // Technically, the algorithm is equivalent to:
+        // offsets = iotaScaled + offset
+        // mask = !(0 <= offsets < length)
+        // except it's trying hard to avoid overflows.
+
+        // iotaScaled is scaled by esize, it is the caller's responsibility
+        // to adjust the length down by esize - 1 to ensure that the lanes
+        // completely fit in bounds. If esize = 1 no adjustment is required.
+
+        // The algorithm assumes that:
+        // - values in iotaScaled are between [0, vlengthScaled)
+        // - vector type can represent values in [0, vlengthScaled) range with full precision
+        //   (this will not work for float8)
+        assert vlengthScaled > 0;
+        if (length < offset || length < 0 || offset <= -vlengthScaled) {
+            return vectorSpecies().maskAll(true);
+        }
+
+        // For each index i, the access at i is in-bounds if and only if
+        // 0 <= offset + i < length
         if (offset < 0) {
-            // An active lane is bad if its number is less than
-            // -offset, because when added to offset it will then
-            // address an array element at a negative index.  To avoid
-            // overflow when converting, clip the comparison value at
-            // vlength.  This specific expression works correctly even
-            // when offset is Integer.MIN_VALUE.
-            // 0 <= firstGoodIndex <= vlength
-            int firstGoodIndex = (int) -Math.max(offset, -vlength);
-            VectorMask badMask2 =
-                    iota.compare(LT, iota.broadcast(firstGoodIndex));
-            if (indexLimit >= vlength) {
-                badMask = badMask2;  // 1st badMask is all true
+            // 0 <= offset + i is equivalent to E(-offset) < i;
+            // E(-offset) will be precise because -vlengthScaled < offset < 0
+            VectorMask lowMask =
+                    iotaScaled.compare(LT, iotaScaled.broadcast(-offset));
+            // check if we need to mask lanes above length.
+            // offset < 0 and vlengthScaled > 0, so offset + vlengthScaled will not overflow
+            if (offset + vlengthScaled > length) {
+                // offset + i < length is equivalent to i < E(length - offset)
+                // E(length - offset) will be precise because 0 <= length - offset < vlengthScaled
+                VectorMask highMask =
+                        iotaScaled.compare(GE, iotaScaled.broadcast(length - offset));
+                return highMask.or(lowMask);
+
             } else {
-                badMask = badMask.or(badMask2);
+                return lowMask;
             }
+        } else {
+            // 0 <= offset + i is guaranteed here because offset >= 0 and i >= 0
+            // offset + i < length is equivalent to i < E(min(vlengthScaled, length - offset))
+            // length - offset will not underflow because 0 <= offset <= length,
+            // length - offset can be clamped to vlengthScaled because i < vlengthScaled.
+
+            // Alternatively, we could directly return an all-false mask if length - offset >= vlengthScaled.
+            int indexLimit = Math.clamp(length - offset, 0, vlengthScaled);
+            VectorMask highMask =
+                    iotaScaled.compare(GE, iotaScaled.broadcast(indexLimit));
+            return highMask;
         }
-        return badMask;
     }
 
     private IndexOutOfBoundsException checkIndexFailed(long offset, int lane,
diff -Nru openjdk-21-21.0.13+9/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventWriter.java openjdk-21-21.0.13.1+2/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventWriter.java
--- openjdk-21-21.0.13+9/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventWriter.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventWriter.java	2026-11-15 23:20:43.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,12 @@
 
     private void putStringValue(String s) {
         int length = s.length();
-        if (isValidForSize(1 + 5 + 3 * length)) {
+        long size = 1L + 5L + 3L * length;
+        if (size > Integer.MAX_VALUE) {
+            valid = false;
+            return;
+        }
+        if (isValidForSize((int)size)) {
             putUncheckedByte(StringParser.Encoding.CHAR_ARRAY.byteValue()); // 1 byte
             putUncheckedInt(length); // max 5 bytes
             for (int i = 0; i < length; i++) {
diff -Nru openjdk-21-21.0.13+9/test/hotspot/jtreg/ProblemList.txt openjdk-21-21.0.13.1+2/test/hotspot/jtreg/ProblemList.txt
--- openjdk-21-21.0.13+9/test/hotspot/jtreg/ProblemList.txt	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/hotspot/jtreg/ProblemList.txt	2026-11-15 23:20:43.000000000 +0000
@@ -69,6 +69,8 @@
 
 compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
 
+compiler/intrinsics/TestBitShuffleOpers.java 8350896 generic-all
+
 compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897 aix-ppc64,linux-ppc64le
 compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64
 
diff -Nru openjdk-21-21.0.13+9/test/hotspot/jtreg/compiler/loopopts/TestTruncationWrapPhiTypeUnion.java openjdk-21-21.0.13.1+2/test/hotspot/jtreg/compiler/loopopts/TestTruncationWrapPhiTypeUnion.java
--- openjdk-21-21.0.13+9/test/hotspot/jtreg/compiler/loopopts/TestTruncationWrapPhiTypeUnion.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/hotspot/jtreg/compiler/loopopts/TestTruncationWrapPhiTypeUnion.java	2026-11-15 23:20:43.000000000 +0000
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts;
+
+/*
+ * @test
+ * @bug 8386830
+ * @summary Test for CountedLoopConverter::filtered_type, where we wrongly
+ *          ignored a nullptr type, and returned a type that was too narrow,
+ *          which led us to wrongly ignore wrapping in
+ *          CountedLoopConverter::has_truncation_wrap
+ * @library /test/lib /
+ * @run main/othervm -Xbatch
+ *                   -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *                   ${test.main.class}
+ * @run main ${test.main.class}
+ */
+public class TestTruncationWrapPhiTypeUnion {
+
+    interface TestMethod {
+        int call();
+    }
+
+    public static void main(String[] args) {
+        int failures = 0;
+
+        failures += run("test1", () -> test1(-1),       11111);
+        failures += run("test2", () -> test2(-1),       11111);
+        failures += run("test3", () -> test3(-100_000), -87065049);
+        failures += run("test4", () -> test4(32770),    10330);
+        failures += run("test5", () -> test5(-63),      10340);
+
+        if (failures > 0) {
+            throw new RuntimeException("failures: " + failures);
+        }
+    }
+
+    static int run(String name, TestMethod t, int expected) {
+        for (int i = 0; i < 20; i++) {
+            int result = t.call();
+            if (result != expected) {
+                System.out.println(name + " wrong result: " + result + " vs " + expected);
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    static int test1(int limit) {
+        int x = 0;
+        int sum = 0;
+
+        limit = (byte) limit; // type BYTE = [-128..127], at runtime: -1
+
+        int i = 510;
+        while (limit < i) {
+            // Exit check checks for positive values, but with
+            // entry 510 and unsigned truncation, that can never fail.
+
+            sum++;
+
+            // Secondary exit check, to make sure we exit eventually.
+            if (++x >= 11111) {
+                break;
+            }
+
+            // Unsigned 15-bit truncation.
+            // We check for wrap/truncation/underflow:
+            //
+            //   } else if (stride_con < 0) {
+            //     if (truncation.trunc_type()->lo_as_long() - phi_ft->lo_as_long() > stride_con ||
+            //         truncation.trunc_type()->hi_as_long() < phi_ft->hi_as_long()) {
+            //       return true;  // truncation may occur
+            //     }
+            //   }
+            //
+            // The lo of truncation is 0, and also the phi type should have a lo of 0,
+            // but it was wrongly determined to be 510.
+            // So, whereas "0 - 0 > -10" would have given us the required "true",
+            // we now checked "0 - 510 > -10", which was wrongly "false".
+            //
+            // The reason is that the phi_ft has been wrongly determined to be 510,
+            // so only considering the entry value. This is determined inside filtered_type:
+            // - entry: filtered_type_from_dominators discovers entry value 510.
+            // - backedge: filtered_type_from_dominators discovers no dominating-if, returns nullptr.
+            // But filtered_type skips nullptr results, as in "no extra filter". But
+            // we should be accumulating the entry and backedge type here!
+            //
+            // The only if on the backedge-path would have been the exit
+            // check: limit < i. But filtered_int_type finds nothing, returns nullptr.
+            i = (i - 10) & 0x7fff;
+        }
+
+        return sum;
+    }
+
+    // Note: this case was first discovered during JDK-8386591, which enabled 0xffff masking.
+    //       Without allowing 0xffff masking, this did not fail. But it was the way I
+    //       first discovered the bug, and so I wanted to add this as a test anyway.
+    static int test2(int limit) {
+        int x = 0;
+        int sum = 0;
+
+        limit = (short) limit; // type SHORT = [-32768..32767], at runtime: -1
+
+        int i = 510;
+        while (limit < i) {
+            // Exit check checks for positive values, but with
+            // entry 510 and unsigned truncation, that can never fial.
+
+            sum++;
+
+            // Secondary exit check, to make sure we exit eventually.
+            if (++x >= 11111) {
+                break;
+            }
+
+            // CHAR truncation: 0..0xffff = 0..65535
+            //
+            // i iterates: 510, 500, ... 10, 0
+            // And then, it shshould ould underflows: (0 - 10) & 0xffff = 65526
+            //
+            // But in CountedLoopConverter::has_truncation_wrap, we wrongly
+            // decide there cannot be overflow.
+            // truncation: [0..65535]
+            // stride_con: -10
+            //
+            // Accordingly, phi_ft should be in [0..65535], and so when we check
+            // for underflow, we check:
+            //
+            //   } else if (stride_con < 0) {
+            //     if (truncation.trunc_type()->lo_as_long() - phi_ft->lo_as_long() > stride_con ||
+            //         truncation.trunc_type()->hi_as_long() < phi_ft->hi_as_long()) {
+            //       return true;  // truncation may occur
+            //     }
+            //   }
+            //
+            // So we should check: 0 - 0 > -10, and we would see that truncation could occur.
+            // But instead, we checked 0 - 510 > -10, which wronly lead to "no truncation".
+            //
+            // The reason is that the phi_ft has been wrongly determined to be 510,
+            // so only considering the entry value. This is determined inside filtered_type:
+            // - entry: filtered_type_from_dominators discovers entry value 510.
+            // - backedge: filtered_type_from_dominators discovers no dominating-if, returns nullptr.
+            // But filtered_type skips nullptr results, as in "no extra filter". But
+            // we should be accumulating the entry and backedge type here!
+            //
+            // The only if on the backedge-path would have been the exit
+            // check: limit < i. But filtered_int_type finds nothing, returns nullptr.
+            i = (i - 10) & 0xffff;
+        }
+
+        return sum;
+    }
+
+    // Another fuzzer find, this one with short truncation.
+    static int test3(int limit) {
+        int x = 0;
+        int sum = 0;
+
+        // Range: [min_int..8192], at runtime: -100_000
+        limit = Math.min(limit, 8192);
+        int i;
+        for (i = 128; limit <= i; i = (short)(i - 16384)) {
+            sum = sum + i + 1;
+            if (x++ > 10789) {
+                break;
+            }
+        }
+        return sum + i;
+    }
+
+    // Another fuzzer find, this one with short truncation.
+    static int test4(int limit) {
+        int sum = 0;
+        int x = 0;
+        limit = (short) limit;
+        for (int i = -1025; limit <= i; i = (short) (i + -7)) {
+            sum = sum + 1;
+            if (x++ > 10328) {
+                break;
+            }
+        }
+        return sum;
+    }
+
+    // Another fuzzer find, again with 0x7fff mask.
+    static int test5(int limit) {
+        int x = 0;
+        int sum = 0;
+        limit = (byte)limit;
+        for (int i = 8192; limit < i; i = ((i + -8) & 0x7fff)) {
+            sum++;
+            if (x++ > 10338) {
+                break;
+            }
+        }
+        return sum;
+    }
+}
diff -Nru openjdk-21-21.0.13+9/test/jdk/java/util/TimeZone/TimeZoneData/VERSION openjdk-21-21.0.13.1+2/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
--- openjdk-21-21.0.13+9/test/jdk/java/util/TimeZone/TimeZoneData/VERSION	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/java/util/TimeZone/TimeZoneData/VERSION	2026-11-15 23:20:43.000000000 +0000
@@ -1 +1 @@
-tzdata2026e
+tzdata2026f
diff -Nru openjdk-21-21.0.13+9/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java openjdk-21-21.0.13.1+2/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
--- openjdk-21-21.0.13+9/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java	2026-11-15 23:20:43.000000000 +0000
@@ -427,28 +427,6 @@
  */
 
 /*
- * @test id=emsignrootcag1
- * @bug 8319187
- * @summary Interoperability tests with eMudhra Root CA G1
- * @library /test/lib
- * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp CAInterop emsignrootcag1 OCSP
- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop emsignrootcag1 OCSP
- * @run main/othervm/manual -Djava.security.debug=certpath CAInterop emsignrootcag1 CRL
- */
-
-/*
- * @test id=emsigneccrootcag3
- * @bug 8319187
- * @summary Interoperability tests with eMudhra ECC Root CA G3
- * @library /test/lib
- * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp CAInterop emsigneccrootcag3 OCSP
- * @run main/othervm/manual -Djava.security.debug=certpath,ocsp -Dcom.sun.security.ocsp.useget=false CAInterop emsigneccrootcag3 OCSP
- * @run main/othervm/manual -Djava.security.debug=certpath CAInterop emsigneccrootcag3 CRL
- */
-
-/*
  * @test id=certainlyrootr1
  * @bug 8321408
  * @summary Interoperability tests with Certainly Root R1
@@ -713,13 +691,6 @@
                     new CATestURLs("https://juolukka.cover.telia.fi:10600",
                             "https://juolukka.cover.telia.fi:10601");
 
-            case "emsignrootcag1" ->
-                    new CATestURLs("https://testovg1.emsign.com/RootOVG1.html",
-                            "https://testovg1r.emsign.com/RootOVG1MR.html");
-            case "emsigneccrootcag3" ->
-                    new CATestURLs("https://testovg3.emsign.com/RootOVG3.html",
-                            "https://testovg3r.emsign.com/RootOVG3MR.html");
-
             case "certainlyrootr1" ->
                     new CATestURLs("https://valid.root-r1.certainly.com",
                             "https://revoked.root-r1.certainly.com");
diff -Nru openjdk-21-21.0.13+9/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java openjdk-21-21.0.13.1+2/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java
--- openjdk-21-21.0.13+9/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8319187
- * @summary Interoperability tests with eMudhra emSign Root CA G2 CS root
- * @build ValidatePathWithParams
- * @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA OCSP
- * @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA CRL
- */
-
-public class EmSignRootG2CA {
-
-    // Owner: CN=emSign CS CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
-    // Issuer: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
-    // Serial number: c084e666596139a1fa9b
-    // Valid from: Sun Feb 18 10:30:00 PST 2018 until: Fri Feb 18 10:30:00 PST 2033
-    private static final String INT = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGeDCCBGCgAwIBAgILAMCE5mZZYTmh+pswDQYJKoZIhvcNAQEMBQAwZzELMAkG\n" +
-            "A1UEBhMCSU4xEzARBgNVBAsTCmVtU2lnbiBQS0kxJTAjBgNVBAoTHGVNdWRocmEg\n" +
-            "VGVjaG5vbG9naWVzIExpbWl0ZWQxHDAaBgNVBAMTE2VtU2lnbiBSb290IENBIC0g\n" +
-            "RzIwHhcNMTgwMjE4MTgzMDAwWhcNMzMwMjE4MTgzMDAwWjBlMQswCQYDVQQGEwJJ\n" +
-            "TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s\n" +
-            "b2dpZXMgTGltaXRlZDEaMBgGA1UEAxMRZW1TaWduIENTIENBIC0gRzIwggIiMA0G\n" +
-            "CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYYkv6Q9an5RylOJ6rkTAHT0cAwfYg\n" +
-            "ZsFKk/Hz/4VwWYsmzf+Z7M8i3CK3mnUcqgw0AIzrVLUwxiKAaL0qca+SbXwOk/7p\n" +
-            "Y/zwwLdg0OhHVGeeU3OTvkbsBpiLS08i7ids9FGrte6m1kqk+QSOY2F5AESxA4+F\n" +
-            "AKXGtzIImQd15m67C88AzzFsvszAAxSvVTqs4hb8BcRnUCzlAp7gMJSwwrrgTiEv\n" +
-            "6Ap6cFVT+n1oj6370sd5KBiRelLoqZtQx4njoNJkJlM30ftPNMGnqPLCloQ6koP/\n" +
-            "dAdpmwWB+F0/5d5UVmVPC3R/F8w7aX3fdSC8+M2E/ZXPVIYkEquLT7K2yXhRl3hn\n" +
-            "xwG6qqGp6TjvKvhiyac8qieu9YNG1R+PVFqejOFMohV2g0Z5MfwaruhUCNwHHeZs\n" +
-            "Dv/MVYMiHcV+5qU+MMzcKngb3RCmq0jzCb+MESomEMiAieCC15W7YC/LpgDHO0jY\n" +
-            "vV4AdLquUHfsOnhT2KD7mEg2PnL7JOwoQSFtuJYmM/coh+Y6CIoV3x+aV1bO7FDF\n" +
-            "ap33u36lE639oQj0tTqW3n1WcyNxhD0lwGlYIAjG8XnhRjtl6/MVVrGuyPWpB4TH\n" +
-            "u8CgNT0roENuq13RnHbBz2rLnndenHiMbxCyElGJBpZfXiF1H25KHUzvyzxt++L+\n" +
-            "hSfprX9BSXLpGQIDAQABo4IBJTCCASEwHwYDVR0jBBgwFoAU7exNRWEYKOezIygR\n" +
-            "HE2lJw1e7PQwHQYDVR0OBBYEFBWGyrZ0lhdIWDSCLM3S4XWer0S3MA4GA1UdDwEB\n" +
-            "/wQEAwIBBjATBgNVHSUEDDAKBggrBgEFBQcDAzA9BgNVHSAENjA0MDIGBFUdIAAw\n" +
-            "KjAoBggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTASBgNV\n" +
-            "HRMBAf8ECDAGAQH/AgEAMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0\n" +
-            "cDovL29jc3AuZW1zaWduLmNvbTAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js\n" +
-            "LmVtc2lnbi5jb20/Um9vdENBRzIuY3JsMA0GCSqGSIb3DQEBDAUAA4ICAQCDkogs\n" +
-            "d5Tv1zwsQdk15btzYK/oI1tEwvN6IpIM9rSqIrje8XnXKjHHmbHX6emHIR31bxuK\n" +
-            "7mY77XjrJMWp+71udC/DgDy4tfZTXIzEekI0XQfcui1UPC08Ysl0taQKTANwsAOV\n" +
-            "VSi7boSGqLet0qSmeKVyQ5/blbwx1NhjyLTyi66rVYf7fYdPV55X5TKUJdKDgiRI\n" +
-            "BomNVRcrrnHZtS8+t9CXxSXR35VAu2ube44Tl+dQHIWz9XwLxtYFwIPSEdqPpoAu\n" +
-            "5XEVo7evwMHQoY/MQj6Ywbw6tYh6bHu6C/qrp4oSyYXbz2ZWlHkz1oEXvefi7a9Z\n" +
-            "6mKnnaY3UYHq5AI+k6ojazVFbSTenb/TO/Z247gdhG7Wssshd6pgyqcTEa+FZz+F\n" +
-            "5ZZdoiIl8UJsTCPPg0xP9Ab0WE3BjCCqTPt+Czbd3cgBxiBS7KTQs/DnQRFuPCjC\n" +
-            "khbDtHsCN4aUoLM9OOw94/ZcoU0G5cg9mSvONBxUv9W7SIpJreXXMPXixcBKULoJ\n" +
-            "focui3s0yzGqTA9tSzQ4nmA9aXBCAAxrABlY/hk10ImeBa1SPjocRb/vuCaGp74T\n" +
-            "n8oADP42XudDnp8wlOKWxFJulhNi960Rev+5vZOPF/LGfS78GI6yzBjR49VJGhOP\n" +
-            "EJK8NSNmK3FNblQfOyFM7VE0uOGHOUwpMGVM2A==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=test, OU=test, O=test, L=test, ST=test, C=IN
-    // Issuer: CN=emSign CS CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
-    // Serial number: 7c9ade672c0ad1b6
-    // Valid from: Wed Aug 30 05:39:25 PDT 2023 until: Sat Aug 30 05:39:25 PDT 2025
-    private static final String VALID = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGNjCCBB6gAwIBAgIIfJreZywK0bYwDQYJKoZIhvcNAQEMBQAwZTELMAkGA1UE\n" +
-            "BhMCSU4xEzARBgNVBAsTCmVtU2lnbiBQS0kxJTAjBgNVBAoTHGVNdWRocmEgVGVj\n" +
-            "aG5vbG9naWVzIExpbWl0ZWQxGjAYBgNVBAMTEWVtU2lnbiBDUyBDQSAtIEcyMB4X\n" +
-            "DTIzMDgzMDEyMzkyNVoXDTI1MDgzMDEyMzkyNVowWDELMAkGA1UEBhMCSU4xDTAL\n" +
-            "BgNVBAgTBHRlc3QxDTALBgNVBAcTBHRlc3QxDTALBgNVBAoMBHRlc3QxDTALBgNV\n" +
-            "BAsTBHRlc3QxDTALBgNVBAMTBHRlc3QwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAw\n" +
-            "ggGKAoIBgQC04pOiSFbl7Bd4wFYXzzyukKh+EmwIq8xRGQDkuYH+C6Zao36VAV+k\n" +
-            "xGw7lmM3rf4YUcArgZYHfrxgPJNBbGrCi/YnEPYQTNwSrBAePUx1tt13LVBxHfNu\n" +
-            "cQQT+kqE7064WsYfmfr/uzJZemqVH7lG82DN23+8E/235AIh3lz/pn7T9ByLj7TV\n" +
-            "zWP40oT0UfQXQvWUpFevPONu/RksRP+NiKV3ji6/wYpvrfodzkrGxw2DPfOh4Iam\n" +
-            "j6bBH2rkTMToH853plsQGr2ji8OndePfvDdk+5c33Jz1knCNPZSlYQIIp8scyz4z\n" +
-            "jaUGdoC140FjEA1SMA2WzpRJoE7xjAidLv7jiV596/bTwrIM+IZhzBc8SKRmkdZ6\n" +
-            "lYjPYJHPqRosRtfxcQne3pY6F4s1aOUtuGJaQS/AJkkykZoOx27plWM5SjtmlrL+\n" +
-            "7g2/ihWT9CEagYuo44tqk9Tmp3P37+ADAmiXxP0zUxYIv77DSabdArrZ+AB5XUol\n" +
-            "V8sxE1V6h0UCAwEAAaOCAXUwggFxMB8GA1UdIwQYMBaAFBWGyrZ0lhdIWDSCLM3S\n" +
-            "4XWer0S3MB0GA1UdDgQWBBQ2k0TE2p46sYwI5M/a1XJ8M5Oc8DAOBgNVHQ8BAf8E\n" +
-            "BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwNwYDVR0fBDAwLjAsoCqgKIYmaHR0\n" +
-            "cDovL2NybC5lbXNpZ24uY29tP2VtU2lnbkNTQ0FHMi5jcmwwTgYDVR0gBEcwRTA5\n" +
-            "BgsrBgEEAYOOIQEAATAqMCgGCCsGAQUFBwIBFhxodHRwOi8vcmVwb3NpdG9yeS5l\n" +
-            "bVNpZ24uY29tMAgGBmeBDAEEATBzBggrBgEFBQcBAQRnMGUwIgYIKwYBBQUHMAGG\n" +
-            "Fmh0dHA6Ly9vY3NwLmVtU2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBv\n" +
-            "c2l0b3J5LmVtc2lnbi5jb20vY2VydHMvZW1TaWduQ1NDQUcyLmNydDAMBgNVHRMB\n" +
-            "Af8EAjAAMA0GCSqGSIb3DQEBDAUAA4ICAQBKLa7j8fNpcnWNv7NegrMKTRy7gycI\n" +
-            "qrMK848wISX6jl2wg6b275sWQHzQRxA6rbB76bF2HXLFcpITJPaz+vjetYOVQd4v\n" +
-            "l8iZN52OpN6Pwrheiz7JhdLiHisN+2NKMmF899bH7w1l2Sr/FQl5vqk41gwwWMen\n" +
-            "99Waf4Bp6p3lvBArK2BbabTs8+16xvmkHEK3d3l3Bu6qTEbQRgUI5XsVXmXXn8Pg\n" +
-            "IANliTEsbsN9CMWrJ56ciEujU7w2L+IBfvKhl10N1AQNHwpQzwfFyz2BUbACN75o\n" +
-            "feIUBarM3ssNzpnt7idgkCTwWVrdEL1NHyW967aEMWyVwaRrtkjFOW/0xuSr2rEI\n" +
-            "jBpPj5RPdP6ZEaqnmg5PIgSrJ8FBjx6JmvVgZH/XEl5MZ7PsvJFfIMun6RxXtGn7\n" +
-            "QP0+ipkRrI6USNFS84H53Q0WJhQWZUgd3cdm37wpFGvxOVEskIgJNW9SbOgiT9sB\n" +
-            "zTIy3ceOK2onmUkDM2Q2+Hbc7A4BmNIlW4fpYXvZlM7IXSl9U3Voks92Hi45azgz\n" +
-            "StWZv9+Ronmmp+b7JKCe7MZXIBHfj0JhAVNJiYTZ9BqkY2VRvuQPVUdKxske9fQ6\n" +
-            "ciFJ5a6RDOhce6pFloaQu39ci2XCY1N4mIR3vFzpmBNkttlEXviK07XNTv9cnQt6\n" +
-            "3CW5aMAsfTbmOw==\n" +
-            "-----END CERTIFICATE-----";
-
-    // Owner: CN=test, OU=test, O=test, L=test, ST=test, C=IN
-    // Issuer: CN=emSign CS CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
-    // Serial number: cf02dedd03d2f509
-    // Valid from: Thu Oct 05 22:38:51 PDT 2023 until: Sun Oct 05 22:38:51 PDT 2025
-    private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" +
-            "MIIGNzCCBB+gAwIBAgIJAM8C3t0D0vUJMA0GCSqGSIb3DQEBDAUAMGUxCzAJBgNV\n" +
-            "BAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRl\n" +
-            "Y2hub2xvZ2llcyBMaW1pdGVkMRowGAYDVQQDExFlbVNpZ24gQ1MgQ0EgLSBHMjAe\n" +
-            "Fw0yMzEwMDYwNTM4NTFaFw0yNTEwMDYwNTM4NTFaMFgxCzAJBgNVBAYTAklOMQ0w\n" +
-            "CwYDVQQIEwR0ZXN0MQ0wCwYDVQQHEwR0ZXN0MQ0wCwYDVQQKDAR0ZXN0MQ0wCwYD\n" +
-            "VQQLEwR0ZXN0MQ0wCwYDVQQDEwR0ZXN0MIIBojANBgkqhkiG9w0BAQEFAAOCAY8A\n" +
-            "MIIBigKCAYEAmUSghjvjUvVgYguH2PMLwW4TwtYsNDpAuGPqux53lI9v9S5u4oAv\n" +
-            "m1Sa3MW7CeEnhHNAIFu/AKvNXSfkvnJpTozWstZMjd93DcNacteBG0fBKTkIq+5k\n" +
-            "A8qIBiXWk8NORlbjV5bXnoW2pO7wbrALDK3FGf2JAQjuYWXE1mlVk0+SJewUSN+F\n" +
-            "XTl63V3tcaqjxhoViY8/dCWc7pNTPgQ/f+Rmnm1bpE0hxVPpQ29+60lyoNtKiOWj\n" +
-            "InKRKBV8jYkR/xI13bKWguaxZnswpf2MrophQTvO9ivPHADWhZlNYYjYYEMl4tbi\n" +
-            "rG2EquJ7g8Jdo+aL3BggLv5gFkpfoEcaveNuUWy7ggUl7MNhvgDdWdoi6VY7R8Fi\n" +
-            "F52+JqPByGpHkZKi0wPa3BaI7guGGyCn3TMe66kNTMS4ADxHktqQlpNSaYYl/84G\n" +
-            "lnr2WxQt/W+sXoorlKc/Kh0ubbm6eDzPE8kkIDV2uIxUEgSL7SJQ95yf5XgRihoH\n" +
-            "KoBA45iR5vCtAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQVhsq2dJYXSFg0gizN\n" +
-            "0uF1nq9EtzAdBgNVHQ4EFgQUDs5dk74eElzdEKdxIlkzISoWSFkwDgYDVR0PAQH/\n" +
-            "BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMDcGA1UdHwQwMC4wLKAqoCiGJmh0\n" +
-            "dHA6Ly9jcmwuZW1zaWduLmNvbT9lbVNpZ25DU0NBRzIuY3JsME4GA1UdIARHMEUw\n" +
-            "OQYLKwYBBAGDjiEBAAEwKjAoBggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnku\n" +
-            "ZW1TaWduLmNvbTAIBgZngQwBBAEwcwYIKwYBBQUHAQEEZzBlMCIGCCsGAQUFBzAB\n" +
-            "hhZodHRwOi8vb2NzcC5lbVNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw\n" +
-            "b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL2VtU2lnbkNTQ0FHMi5jcnQwDAYDVR0T\n" +
-            "AQH/BAIwADANBgkqhkiG9w0BAQwFAAOCAgEAGa2XSoRkoIkHHHGXrdzTBCf/+KgK\n" +
-            "FlHhqlBOk5rwLDX1sfNlmsaz10I69phE90Ac8Coa/xCrBaFrTYqRvmkY9gU19jkn\n" +
-            "FdVcwQEHNku7Ro/Z/mbyi+aTBzHMTy0Vl4HqVnQInjV891n64SerUuAB7wNVOOho\n" +
-            "GoBfpf6lzDzzuEmetFokHYv1tWGQqPF/dHLARQraUlQpWjsnOx0QcZ5cM79REONE\n" +
-            "y6uzXT2vaatT3ns8Mtx8zooq+t8pnZlXJqlrwNTcnPad9gSsVu6vfsnWhLhz0VLG\n" +
-            "sYPXcWIssLbBQW3v5z0l1Isj7vy2UFfbn8AmZ0PanPo3v3C2sk19DK+Zlc9xBAXc\n" +
-            "KKwc4m8le6QkP/EB2wUA7ey5Cf29hjNDJpZznquEaWl9aKbBRdJDKsK88IBJjzK0\n" +
-            "Gbpw9fYJ3txuGA7Q27gyaZAeGAIrFvOtRY0XFbr20qSh2GBBYN57+lBPh4UKqgy8\n" +
-            "Z2Kk/2jK9k+nm41JYCmwVZHg3Va9RRfW8FkeE95gAUFPDWjeV+GvcimCbcB3DwaZ\n" +
-            "9fy1qfV4xsduhC3ei6f7Ask8LbAEWaEIXmgK10YbIfhzomCyCzlA+E+gwkq/bmkv\n" +
-            "B8hh27KWA6IRt7URI51MZlh0e8fULyXlOZcoJA/IPX9RdePa2RHFuPSypBHjoN7z\n" +
-            "6bCML1XZ2xnHIAg=\n" +
-            "-----END CERTIFICATE-----";
-
-    public static void main(String[] args) throws Exception {
-
-        ValidatePathWithParams pathValidator = new ValidatePathWithParams(null);
-
-        if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) {
-            pathValidator.enableCRLCheck();
-        } else {
-            // OCSP check by default
-            pathValidator.enableOCSPCheck();
-        }
-
-        // Validate valid
-        pathValidator.validate(new String[]{VALID, INT},
-                ValidatePathWithParams.Status.GOOD, null, System.out);
-
-        // Validate Revoked
-        pathValidator.validate(new String[]{REVOKED, INT},
-                ValidatePathWithParams.Status.REVOKED,
-                "Thu Oct 05 22:51:36 PDT 2023", System.out);
-    }
-}
diff -Nru openjdk-21-21.0.13+9/test/jdk/sun/security/krb5/ErrorMessages.java openjdk-21-21.0.13.1+2/test/jdk/sun/security/krb5/ErrorMessages.java
--- openjdk-21-21.0.13+9/test/jdk/sun/security/krb5/ErrorMessages.java	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/sun/security/krb5/ErrorMessages.java	2026-11-15 23:20:43.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 8316771
+ * @library /test/lib
+ * @modules java.security.jgss/sun.security.krb5.internal:+open
+ * @summary make sure each error code has a message
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.krb5.internal.Krb5;
+
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+
+public class ErrorMessages {
+    public static void main(String[] args) throws Exception {
+        boolean isError = false;
+        int count = 0;
+        int size = -1;
+        for (Field v : Krb5.class.getDeclaredFields()) {
+            // The spec of the Class::getDeclaredFields method claims
+            // "The elements in the returned array are not sorted and
+            // are not in any particular order". However, the current
+            // implementation seems to be listing them in the order
+            // they appear in the code.
+            if (v.getName().equals("errMsgList")) {
+                v.setAccessible(true);
+                size = ((Hashtable)v.get(null)).size();
+                break;
+            }
+            if (v.getName().equals("KDC_ERR_NONE")) {
+                isError = true;
+            }
+            if (!isError) continue;
+            Asserts.assertNotEquals(Krb5.getErrorMessage((int)v.get(null)),
+                    null, "No msg for " + v);
+            count++;
+        }
+        Asserts.assertEQ(count, size, "Different size");
+    }
+}
diff -Nru openjdk-21-21.0.13+9/test/jdk/sun/security/krb5/auto/KDC.java openjdk-21-21.0.13.1+2/test/jdk/sun/security/krb5/auto/KDC.java
--- openjdk-21-21.0.13+9/test/jdk/sun/security/krb5/auto/KDC.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/sun/security/krb5/auto/KDC.java	2026-11-15 23:20:43.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1026,6 +1026,9 @@
                     body.addresses != null ? body.addresses
                             : etp.caddr,
                     null);
+
+            enc = modifyEncTicketPart(1, enc);
+
             EncryptionKey skey = keyForUser(service, e3, true);
             if (skey == null) {
                 throw new KrbException(Krb5.KDC_ERR_SUMTYPE_NOSUPP); // TODO
@@ -1086,6 +1089,12 @@
         }
     }
 
+    // Overridable by subclass to modify a ticket before encryption.
+    // type is 0 for AS-REQ and 1 for TGS-REQ.
+    protected EncTicketPart modifyEncTicketPart(int type, EncTicketPart enc) {
+        return enc;
+    }
+
     /**
      * Processes a AS_REQ and generates a AS_REP (or KRB_ERROR)
      * @param in the request
@@ -1371,6 +1380,9 @@
                     till, rtime,
                     body.addresses,
                     null);
+
+            enc = modifyEncTicketPart(0, enc);
+
             Ticket t = new Ticket(
                     service,
                     new EncryptedData(skey, enc.asn1Encode(), KeyUsage.KU_TICKET)
diff -Nru openjdk-21-21.0.13+9/test/jdk/sun/security/lib/CheckBlockedCerts.java openjdk-21-21.0.13.1+2/test/jdk/sun/security/lib/CheckBlockedCerts.java
--- openjdk-21-21.0.13+9/test/jdk/sun/security/lib/CheckBlockedCerts.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/sun/security/lib/CheckBlockedCerts.java	2026-11-15 23:20:43.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,21 +56,19 @@
             }
         }
 
-        // All certs in the pem files
-        Set blocked = new HashSet<>();
-
         // Assumes the full src is available
         File blockedCertsFile = new File(System.getProperty("test.src"),
                 "../../../../../src/java.base/share/data/blockedcertsconverter/blocked.certs.pem");
 
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        int expectedCount = 0;
         try (FileInputStream fis = new FileInputStream(blockedCertsFile)) {
             Collection certs
                     = cf.generateCertificates(fis);
             System.out.println(certs.size());
             for (Certificate c: certs) {
-                blocked.add(c);
                 X509Certificate cert = ((X509Certificate)c);
+                expectedCount += cert.getSigAlgName().contains("ECDSA") ? 4 : 2;
                 if (!UntrustedCertificates.isUntrusted(cert)) {
                     System.out.println(cert.getSubjectX500Principal() +
                             " is trusted");
@@ -101,11 +99,11 @@
                 failed = true;
             }
             // There are two unique fingerprints for each RSA certificate
-            if (ccount != blocked.size() * 2
-                    && !blocked.isEmpty()) {
+            if (ccount != expectedCount
+                    && expectedCount != 0) {
                 System.out.println("Wrong blocked.certs size: "
-                        + ccount + " fingerprints, "
-                        + blocked.size() + " certs");
+                        + ccount + " fingerprints, expected"
+                        + expectedCount);
                 failed = true;
             }
         }
diff -Nru openjdk-21-21.0.13+9/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java openjdk-21-21.0.13.1+2/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
--- openjdk-21-21.0.13+9/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java	2026-11-15 23:20:43.000000000 +0000
@@ -29,6 +29,7 @@
  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
  *      8305975 8304760 8307134 8295894 8314960 8317373 8317374 8318759 8319187
  *      8321408 8316138 8341057 8303770 8350498 8359170 8361212 8372351 8387123
+ *      8395690
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -47,12 +48,12 @@
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 110;
+    private static final int COUNT = 106;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "AA:C2:64:41:28:06:1F:83:92:54:7C:DD:95:82:61:4C:8F:FA:09:7B:17:64:A7:A8:7C:A9:F6:27:25:95:2D:BB";
+            = "C4:EA:62:8E:D2:49:7E:E7:97:3D:C6:42:C3:62:D2:33:E5:0A:6F:9D:45:57:4B:B5:A2:C6:19:62:87:21:D5:34";
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -77,8 +78,6 @@
                     "C0:A6:F4:DC:63:A2:4B:FD:CF:54:EF:2A:6A:08:2A:0A:72:DE:35:80:3E:2F:F5:FF:52:7A:E5:D8:72:06:DF:D5");
             put("comodorsaca [jdk]",
                     "52:F0:E1:C4:E5:8E:C6:29:29:1B:60:31:7F:07:46:71:B8:5D:7E:A8:0D:5B:07:27:34:63:53:4B:32:B4:02:34");
-            put("comodoaaaca [jdk]",
-                    "D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4");
             put("comodoeccca [jdk]",
                     "17:93:92:7A:06:14:54:97:89:AD:CE:2F:8F:34:F7:F0:B6:6D:0F:3A:E3:A3:B8:4D:21:EC:15:DB:BA:4F:AD:C7");
             put("usertrustrsaca [jdk]",
@@ -251,12 +250,6 @@
                     "D4:8D:3D:23:EE:DB:50:A4:59:E5:51:97:60:1C:27:77:4B:9D:7B:18:C9:4D:5A:05:95:11:A1:02:50:B9:31:68");
             put("teliarootcav2 [jdk]",
                     "24:2B:69:74:2F:CB:1E:5B:2A:BF:98:89:8B:94:57:21:87:54:4E:5B:4D:99:11:78:65:73:62:1F:6A:74:B8:2C");
-            put("emsignrootcag1 [jdk]",
-                    "40:F6:AF:03:46:A9:9A:A1:CD:1D:55:5A:4E:9C:CE:62:C7:F9:63:46:03:EE:40:66:15:83:3D:C8:C8:D0:03:67");
-            put("emsigneccrootcag3 [jdk]",
-                    "86:A1:EC:BA:08:9C:4A:8D:3B:BE:27:34:C6:12:BA:34:1D:81:3E:04:3C:F9:E8:A8:62:CD:5C:57:A3:6B:BE:6B");
-            put("emsignrootcag2 [jdk]",
-                    "1A:A0:C2:70:9E:83:1B:D6:E3:B5:12:9A:00:BA:41:F7:EE:EF:02:08:72:F1:E6:50:4B:F0:F6:C3:F2:4F:3A:F3");
             put("certainlyrootr1 [jdk]",
                     "77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0");
             put("certainlyroote1 [jdk]",
diff -Nru openjdk-21-21.0.13+9/test/micro/org/openjdk/bench/java/lang/StringBuilders.java openjdk-21-21.0.13.1+2/test/micro/org/openjdk/bench/java/lang/StringBuilders.java
--- openjdk-21-21.0.13+9/test/micro/org/openjdk/bench/java/lang/StringBuilders.java	2026-10-19 12:10:20.000000000 +0000
+++ openjdk-21-21.0.13.1+2/test/micro/org/openjdk/bench/java/lang/StringBuilders.java	2026-11-15 23:20:43.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -364,6 +364,54 @@
         return sbUtf16.charAt(charAt_index);
     }
 
+    @Benchmark
+    public StringBuilder repeatLatin1StringOntoLatin1StringBuilder(Data data) {
+        var sbLatin1 = new StringBuilder("a");
+        return sbLatin1.repeat(data.str, data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatLatin1StringOntoUtf16StringBuilder(Data data) {
+        var sbUtf16 = new StringBuilder("\u04FF");
+        return sbUtf16.repeat(data.str, data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatUtf16StringOntoLatin1StringBuilder(Data data) {
+        var sbLatin1 = new StringBuilder("a");
+        return sbLatin1.repeat(data.utf16Str, data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatUtf16StringOntoUtf16StringBuilder(Data data) {
+        var sbUtf16 = new StringBuilder("\u04FF");
+        return sbUtf16.repeat(data.utf16Str, data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatLatin1CodePointOntoLatin1StringBuilder(Data data) {
+        var sbLatin1 = new StringBuilder("a");
+        return sbLatin1.repeat('a', data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatLatin1CodePointOntoUtf16StringBuilder(Data data) {
+        var sbUtf16 = new StringBuilder("\u04FF");
+        return sbUtf16.repeat('a', data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatUtf16BmpCodePointOntoLatin1StringBuilder(Data data) {
+        var sbLatin1 = new StringBuilder("a");
+        return sbLatin1.repeat(0x4FF, data.length);
+    }
+
+    @Benchmark
+    public StringBuilder repeatUtf16BmpCodePointOntoUtf16StringBuilder(Data data) {
+        var sbUtf16 = new StringBuilder("\u04FF");
+        return sbUtf16.repeat(0x4FF, data.length);
+    }
+
     @State(Scope.Thread)
     public static class Data {
         int i = 0;