Author: markt
Date: Tue Dec 18 11:29:28 2018
New Revision: 1849168
URL: http://svn.apache.org/viewvc?rev=1849168&view=rev
Log:
Update test keys and certs to use new CA hierarchy that has a longer key (4096
bits) for the CA and more complete DNs. Fixes APR test failure with Java 11
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca.jks
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/keystore-info.txt
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost.jks
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/user1.jks
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 18 11:29:28 2018
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767636,1767641-1767644,1767903,1767945-1767946,176
8123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771226,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,
1778061,1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787662,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,17885
43-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789685,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790443,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,17
93980,1794556,1794674,1794684,1794752,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799498,1799514-1799515,1799677,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800980-1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038
,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808466,1808481-1808482,1808695,1808701,1808761,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811
137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812087-1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815778,1815786,1815790,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1817965,1817997,1817999-1818001,1818004,1818127,1818179,1818184,1818438,1818711,1818919,1818976,1819054,1
819057,1819061,1819063,1819068,1819070-1819071,1819074,1819077,1819148,1819903,1820003,1820005,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820265,1820272,1820276,1820279,1820281,1820302,1820634,1820701,1820705,1820932,1820981,1820994,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251-1821252,1821293,1821328,1821381,1821490,1821708,1821932,1822001,1822016,1822109,1822111,1822116,1822150,1822232,1822524,1822644,1822775,1822945-1822946,1823006-1823007,1823102,1823111,1823150,1823161,1823262,1823306,1823310,1823337,1823481,1823483,1823492,1823495,1823540,1823620,1824154,1824201,1824228,1824254,1824263,1824297,1824301,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825516,1825519,1825713,1825738,1825872,1825909,1825943,1825987,1826048,1826111,1826115,1826209,1826361,1826375,1826688,1826731,1826794,1826812,1826817,1826825,1826867,1826869,1826958,1826975,1826977,1826979,1826985-1826986,1827150,1827203-1827204,1827223,1827297,182729
9,1827363,1827368,1827396,1827408,1827428,1827479,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828551,1828565,1828946,1829082,1829084,1829086,1829276,1829355,1829364,1829366,1829830,1829879,1829915,1829924,1829934,1829990-1829991,1830013,1830051,1830068,1830087,1830325,1830336,1830341,1830367,1830373,1830378,1830549,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830864,1830989,1830999-1831001,1831251,1831256,1831262,1831333,1831338,1831341-1831342,1831389,1831410,1831439,1831483,1831486,1831556,1831568,1831573,1831691,1831718,1831726,1831763,1831828,1831985,1832017,1832124-1832125,1832127,1832129,1832160,1832163,1832193,1832262,1832455,1832518-1832519,1832525-1832526,1832545,1832554,1832572,1832592,1832596,1832602,1832619,1832665,1832692,1832696,1832704,1832707,1832744,1832843,1832856,1832882,1832925,1832965,1833001,1833016,1833062,1833071,1833737,1833757,1833768-1833770,1833794-1833800,1833825,1833831,1833906,1833915,1833918,1833982,1833989,183
3994,1834001,1834003,1834011,1834020,1834058,1834080,1834195,1834197-1834198,1834354,1834356,1834411,1834542,1834548,1834550,1834559,1834672,1834689,1834703,1834860,1834877,1835085,1835193-1835194,1835229,1835246,1835261,1835263-1835264,1835269-1835271,1835413,1835416,1835421,1835427,1835429,1835431,1835435,1835438,1835458,1835465,1835543,1835622,1835639,1835831,1835844,1836102,1836738,1836949,1837044,1837133,1837156,1837176,1837300,1837510-1837511,1837520,1837523,1837530,1837551,1837554,1837581,1837613,1837637,1837726,1837731,1837734-1837737,1837746,1837786-1837788,1837809-1837810,1837818,1837865,1837871-1837872,1837878,1837895,1838028,1838100,1838104,1838106-1838107,1838155,1838163,1838188,1838243,1838275,1838277,1838279,1838281,1838286,1838400,1838433,1838473,1838492,1838494,1838502,1838925,1838942,1839057,1839237,1839239,1839575,1839604,1839737,1839741,1839752,1839765,1839922,1839955,1839960,1839977,1839983-1839984,1840055,1840059,1840062,1840099,1840264,1840279,1840535,1840634,
1840641,1840653,1840655,1840681,1840706-1840707,1840709,1840712,1840737,1840747,1840759,1840763-1840764,1840812,1840817,1840922,1841069,1841347,1841445,1841746,1841757,1841893,1842203,1842656,1842658-1842659,1842691,1842702,1842706,1842725,1842809,1842816-1842817,1842878,1842950,1843048,1843142,1843314,1843404-1843405,1843428-1843429,1843474,1843536,1843542,1843601,1843630,1843657,1843900,1843991,1844065,1844161-1844162,1844493,1844496-1844497,1844502,1845099,1845210,1845249-1845250,1845338,1845462-1845463,1845465,1845469,1845472,1845489,1845495,1845519,1845573,1845770,1845799,1845893,1845903,1845923,1846236,1846430,1846545,1846551,1846716,1846750,1846753,1846900,1846928,1847015,1847022,1847028,1847097,1847102,1847104,1847472,1847474,1847853,1848046,1848071,1848195,1848240,1848320-1848322,1848330,1848347-1848348,1848415,1848419,1848670,1848675,1848682,1848709,1848959,1848966
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767636,1767641-1767644,1767903,1767945-1767946,176
8123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771226,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,
1778061,1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787662,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,17885
43-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789685,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790443,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,17
93980,1794556,1794674,1794684,1794752,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799498,1799514-1799515,1799677,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800980-1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038
,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804407,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808466,1808481-1808482,1808695,1808701,1808761,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811
132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812087-1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815778,1815786,1815790,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1817965,1817997,1817999-1818001,1818004,1818127,1818179,1818184,1818438,1818711,1818919,1818976,1
819054,1819057,1819061,1819063,1819068,1819070-1819071,1819074,1819077,1819148,1819903,1820003,1820005,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820265,1820272,1820276,1820279,1820281,1820302,1820634,1820701,1820705,1820932,1820981,1820994,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251-1821252,1821293,1821328,1821381,1821490,1821708,1821932,1822001,1822016,1822109,1822111,1822116,1822150,1822232,1822524,1822644,1822775,1822945-1822946,1823006-1823007,1823102,1823111,1823150,1823161,1823262,1823306,1823310,1823337,1823481,1823483,1823492,1823495,1823540,1823620,1824154,1824201,1824228,1824254,1824263,1824297,1824301,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825516,1825519,1825713,1825738,1825872,1825909,1825943,1825987,1826048,1826111,1826115,1826209,1826361,1826375,1826688,1826731,1826794,1826812,1826817,1826825,1826867,1826869,1826958,1826975,1826977,1826979,1826985-1826986,1827150,1827203-1827204,1827223,182729
7,1827299,1827363,1827368,1827396,1827408,1827428,1827479,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828551,1828565,1828946,1829082,1829084,1829086,1829276,1829355,1829364,1829366,1829830,1829879,1829915,1829924,1829934,1829990-1829991,1830013,1830051,1830068,1830087,1830325,1830336,1830341,1830367,1830373,1830378,1830549,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830864,1830989,1830999-1831001,1831251,1831256,1831262,1831333,1831338,1831341-1831342,1831389,1831410,1831439,1831483,1831486,1831556,1831568,1831573,1831691,1831718,1831726,1831763,1831828,1831985,1832017,1832124-1832125,1832127,1832129,1832160,1832163,1832193,1832262,1832455,1832518-1832519,1832525-1832526,1832545,1832554,1832572,1832592,1832596,1832602,1832619,1832665,1832692,1832696,1832704,1832707,1832744,1832843,1832856,1832882,1832925,1832965,1833001,1833016,1833062,1833071,1833737,1833757,1833768-1833770,1833794-1833800,1833825,1833831,1833906,1833915,1833918,1833982,183
3989,1833994,1834001,1834003,1834011,1834020,1834058,1834080,1834195,1834197-1834198,1834354,1834356,1834411,1834542,1834548,1834550,1834559,1834672,1834689,1834703,1834860,1834877,1835085,1835193-1835194,1835229,1835246,1835261,1835263-1835264,1835269-1835271,1835413,1835416,1835421,1835427,1835429,1835431,1835435,1835438,1835458,1835465,1835543,1835622,1835639,1835831,1835844,1836102,1836738,1836949,1837044,1837133,1837156,1837176,1837300,1837510-1837511,1837520,1837523,1837530,1837551,1837554,1837581,1837613,1837637,1837726,1837731,1837734-1837737,1837746,1837786-1837788,1837809-1837810,1837818,1837865,1837871-1837872,1837878,1837895,1838028,1838100,1838104,1838106-1838107,1838155,1838163,1838188,1838243,1838275,1838277,1838279,1838281,1838286,1838400,1838433,1838473,1838492,1838494,1838502,1838925,1838942,1839057,1839237,1839239,1839575,1839604,1839737,1839741,1839752,1839765,1839922,1839955,1839960,1839977,1839983-1839984,1840055,1840059,1840062,1840099,1840264,1840279,1840535,
1840634,1840641,1840653,1840655,1840681,1840706-1840707,1840709,1840712,1840737,1840747,1840759,1840763-1840764,1840812,1840817,1840922,1841069,1841347,1841445,1841746,1841757,1841893,1842203,1842656,1842658-1842659,1842691,1842702,1842706,1842725,1842809,1842816-1842817,1842878,1842950,1843048,1843142,1843314,1843404-1843405,1843428-1843429,1843474,1843536,1843542,1843601,1843630,1843657,1843900,1843991,1844065,1844161-1844162,1844493,1844496-1844497,1844502,1845099,1845210,1845249-1845250,1845338,1845462-1845463,1845465,1845469,1845472,1845489,1845495,1845519,1845573,1845770,1845799,1845893,1845903,1845923,1846236,1846430,1846545,1846551,1846716,1846750,1846753,1846900,1846928,1847015,1847022,1847028,1847097,1847102,1847104,1847472,1847474,1847853,1848046,1848071,1848195,1848240,1848320-1848322,1848330,1848347-1848348,1848415,1848419,1848670,1848675,1848682,1848709,1848959,1848966
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca.jks
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca.jks?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/keystore-info.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/keystore-info.txt?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/keystore-info.txt
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/keystore-info.txt Tue
Dec 18 11:29:28 2018
@@ -16,13 +16,13 @@
================================================================================
ca.jks (changeit)
- ca CN=ca-test.tomcat.apache.org
+ ca CN=Apache Tomcat Test CA
localhost.jks (changeit)
- tomcat CN=ca-test.tomcat.apache.org
+ tomcat CN=localhost
localhost-copy1.jks (changeit)
- tomcat CN=ca-test.tomcat.apache.org (tomcatpass)
+ tomcat CN=localhost (tomcatpass)
user1.jks (changeit)
user1 CN=user1
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem Tue
Dec 18 11:29:28 2018
@@ -1,35 +1,35 @@
Certificate:
Data:
Version: 3 (0x2)
- Serial Number: 4109 (0x100d)
+ Serial Number: 4096 (0x1000)
Signature Algorithm: sha256WithRSAEncryption
- Issuer: C=US, CN=ca-test.tomcat.apache.org
+ Issuer: C=US, ST=MA, L=Wakefield, O=The Apache Software Foundation,
OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA
Validity
- Not Before: Feb 27 23:25:29 2017 GMT
- Not After : Feb 27 23:25:29 2019 GMT
- Subject: C=US, CN=localhost
+ Not Before: Aug 8 10:41:05 2017 GMT
+ Not After : Aug 8 10:41:05 2019 GMT
+ Subject: C=US, ST=MA, L=Wakefield, O=The Apache Software Foundation,
OU=Apache Tomcat PMC, CN=localhost
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
Public-Key: (2048 bit)
Modulus:
- 00:ba:d6:b2:32:de:10:53:1f:5d:af:da:d4:3f:64:
- b3:22:37:fd:4e:16:a3:f0:d6:9e:6e:d3:ee:47:ec:
- 15:b4:b3:0d:80:bf:fc:21:96:8b:1d:40:16:6d:89:
- 35:03:8a:45:8c:c6:6e:2b:66:67:0f:1c:19:cf:62:
- d5:e6:08:48:a8:df:10:da:4c:47:79:7c:02:97:54:
- f9:a8:e9:59:50:33:cd:a0:72:fd:e1:e7:5e:3a:43:
- 5c:ff:0c:69:9e:f6:c2:86:71:07:a5:eb:b5:c7:61:
- f9:e9:fe:3f:26:55:2c:f4:04:7c:c0:bd:cd:2b:88:
- 9c:69:4d:ce:3c:1e:ad:2e:18:96:aa:a0:eb:72:2b:
- 95:99:47:16:90:b5:59:ed:f1:78:cc:8b:01:33:40:
- c4:e9:b0:3f:ec:89:04:13:5c:9b:22:01:cc:25:cf:
- 40:c1:40:fa:04:a0:b9:b7:f7:d8:73:91:7f:b8:7e:
- e9:82:20:1f:e9:9c:89:25:28:b5:fa:6f:b7:4a:88:
- 28:68:59:d5:30:52:f9:e4:5b:a6:b4:f8:e4:ed:2f:
- 03:d8:50:61:9a:53:86:1f:ad:aa:0d:5f:f8:52:b5:
- 27:dd:05:82:25:13:a0:d0:10:3c:dd:c0:70:15:24:
- 63:89:22:0e:f0:5a:9a:fa:b0:75:56:06:aa:7f:b0:
- f7:9b
+ 00:a8:1a:8f:78:58:24:43:9d:90:e1:f2:d5:65:5d:
+ 61:9d:0f:a8:08:20:2c:82:75:8b:b0:ce:96:ba:5b:
+ 99:d3:6b:a2:f8:54:92:6d:07:cc:b3:66:84:8a:8b:
+ 5f:1c:c8:53:eb:a2:c3:54:8c:ce:d0:a7:ff:11:da:
+ e8:78:a2:07:ea:ed:59:db:97:76:25:f7:c0:e8:6d:
+ 43:07:fc:fe:1c:22:82:8a:5a:5c:63:82:8e:fb:53:
+ 9b:46:47:81:34:95:79:75:15:0a:8d:c4:d8:d8:84:
+ df:30:53:d0:6e:40:2c:ba:3b:e2:a1:44:4d:43:de:
+ cf:b0:9e:44:a1:00:26:8f:ca:39:57:14:30:a7:6d:
+ 9a:cc:e4:24:b0:44:1c:28:d3:c3:33:c1:e7:f7:0a:
+ 2a:60:18:60:ed:34:d8:5f:86:a1:ce:c7:fe:cc:56:
+ b0:68:18:46:d2:a0:5a:70:2c:bd:ce:22:1b:41:05:
+ c7:a2:82:49:b2:85:a1:56:14:38:46:27:de:cd:f4:
+ fa:13:0d:9a:80:02:14:d2:1b:47:5f:2c:c9:0c:9f:
+ 70:18:e1:bf:2f:a4:2e:73:7d:ce:0e:6e:2e:11:72:
+ dd:39:1a:37:29:5c:c7:4a:7b:4a:66:47:8a:70:67:
+ 52:24:a7:6b:2a:55:ba:80:da:28:b5:8b:2f:ae:48:
+ d7:8b
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Basic Constraints:
@@ -37,43 +37,69 @@ Certificate:
Netscape Comment:
OpenSSL Generated Certificate
X509v3 Subject Key Identifier:
- 0B:37:2F:D6:48:9C:11:2F:28:AE:DC:47:E6:5E:3A:1D:24:12:0F:1A
+ 01:97:6A:CD:A4:72:D8:B4:A5:3D:A6:78:A1:63:A2:3D:BD:01:E3:22
X509v3 Authority Key Identifier:
-
keyid:B0:3B:BC:C9:FA:28:5F:3E:04:1F:9B:6C:C7:8B:68:D8:01:B0:F8:3D
+
keyid:00:F2:98:4D:21:2C:00:3C:40:9B:84:F4:DE:2A:F0:26:EE:32:0E:9F
+ X509v3 Subject Alternative Name:
+ DNS:localhost, IP Address:127.0.0.1
Signature Algorithm: sha256WithRSAEncryption
- 3b:0a:ad:f2:27:26:d4:db:bc:97:e7:4e:52:8b:6c:08:4d:7b:
- e7:66:ec:81:0b:0c:04:f8:b9:92:35:12:c9:b9:ed:d2:5e:b7:
- ac:89:67:72:7e:2b:4f:5b:e3:3a:d1:09:fe:e8:cf:33:ac:a5:
- 84:95:7f:48:4d:af:59:87:0b:4c:6f:6a:bf:6b:07:af:33:13:
- 19:fd:70:0d:fc:1c:92:04:be:05:b9:96:46:d5:82:a4:f8:3b:
- b0:11:2d:f0:19:25:ba:d6:ce:1c:7a:17:76:c6:80:d2:73:a0:
- 1a:01:48:d6:0b:12:a9:3f:50:66:81:1b:e9:9f:1e:5b:6f:d1:
- 19:12:14:70:d3:de:4c:ab:d3:83:d6:e5:4f:bb:b3:e5:c6:87:
- 16:47:f7:59:4d:9d:52:9d:00:f0:24:7a:1e:6e:14:01:0d:07:
- 0c:b6:f7:4e:c0:40:77:65:fd:ac:c7:aa:73:77:f0:44:b1:30:
- ad:65:83:1a:cc:bd:fa:9d:80:29:61:e9:b3:26:e8:3b:55:c7:
- 12:79:3e:4d:31:f1:21:d0:4e:5f:1f:73:c3:9f:ce:f9:6c:7e:
- 8e:11:10:8e:f6:60:d2:11:ae:0f:24:6e:10:71:42:05:ed:ea:
- 4b:41:86:86:84:26:74:ed:46:81:48:34:16:40:e6:df:64:c9:
- c2:7d:6b:1b
+ a9:41:5b:a3:4b:ac:c3:37:a4:cc:44:88:4b:db:4c:15:9c:57:
+ 08:c2:a7:aa:a6:85:3a:6a:5f:49:0c:aa:6c:6e:95:7f:83:9f:
+ e9:b9:0e:e3:25:c9:c0:f2:31:6e:85:a2:9f:8a:45:61:a0:50:
+ 1e:cd:2c:52:84:5b:49:ab:c2:41:2f:e9:8b:e1:94:77:c7:91:
+ ad:c2:25:05:0f:73:d8:a9:e7:c9:7b:8d:67:aa:6b:25:0a:85:
+ e2:82:ad:d5:d3:e4:62:74:f0:f6:b2:1f:dc:ea:fa:99:c4:7e:
+ bb:8e:fa:07:32:03:6d:29:ba:36:9c:9b:5d:2c:ab:36:d7:48:
+ c7:95:96:4c:0d:25:41:7d:79:b4:5e:07:fa:4b:27:80:16:97:
+ 93:04:b1:eb:9e:de:61:e3:de:b6:cc:62:b1:0e:bd:53:8a:ba:
+ 9c:ea:79:b8:31:88:53:97:6a:64:b2:2d:a0:27:bd:b6:b2:fc:
+ fe:98:5e:74:b2:62:69:95:65:7d:63:34:c0:dc:c1:80:97:16:
+ 63:a7:08:e0:6e:88:ce:39:c6:7a:62:dc:99:ed:72:7f:7e:96:
+ ad:07:78:0c:19:b8:29:46:c6:6c:2f:c2:ef:f8:21:e0:67:80:
+ 28:f6:d5:6c:93:07:65:49:da:99:03:4f:36:66:88:71:b4:16:
+ 19:31:f1:4f:63:d5:b7:77:56:3e:1e:6d:1f:a8:2a:17:60:cd:
+ 61:c3:34:b0:ae:22:22:14:31:1f:0f:18:97:b1:2b:70:78:13:
+ 41:72:7e:cd:4d:f1:a3:17:d9:09:be:d0:09:af:d4:17:ca:5e:
+ 1d:7b:1d:2a:2d:c1:cb:31:36:56:26:c8:13:af:02:0f:c5:45:
+ 86:58:a1:f7:32:60:d1:ba:29:18:ba:17:94:8f:e4:9e:2e:3c:
+ 6a:98:6c:62:77:a1:b2:a1:8f:f8:c7:18:16:3c:27:fb:d2:5f:
+ ed:82:0d:49:95:86:27:e3:73:3c:6d:b4:be:cb:9a:8f:32:7c:
+ 92:48:48:d6:72:c9:82:84:c8:24:b8:aa:fc:3c:d0:0d:c0:52:
+ e6:31:b7:f7:9c:cf:70:76:3a:32:e1:07:69:ba:a5:f3:b6:56:
+ ec:55:6c:1d:d1:b8:d7:42:f6:c0:07:87:66:d5:1d:90:81:7d:
+ f9:0f:67:ac:51:8d:bc:f9:62:ed:85:4e:cb:23:a8:06:65:51:
+ 01:27:2a:73:80:08:ce:e2:cf:f3:d0:d1:47:a7:89:a0:26:24:
+ 4b:2e:19:2a:3a:7c:5a:fc:b4:21:01:e8:d7:75:15:ed:8e:48:
+ 33:49:ac:7e:ee:66:b2:06:24:2a:77:70:e7:fb:a5:21:8d:57:
+ 27:de:8f:f4:d4:4f:7a:2d
-----BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgICEA0wDQYJKoZIhvcNAQELBQAwMTELMAkGA1UEBhMCVVMx
-IjAgBgNVBAMMGWNhLXRlc3QudG9tY2F0LmFwYWNoZS5vcmcwHhcNMTcwMjI3MjMy
-NTI5WhcNMTkwMjI3MjMyNTI5WjAhMQswCQYDVQQGEwJVUzESMBAGA1UEAxMJbG9j
-YWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutayMt4QUx9d
-r9rUP2SzIjf9Thaj8NaebtPuR+wVtLMNgL/8IZaLHUAWbYk1A4pFjMZuK2ZnDxwZ
-z2LV5ghIqN8Q2kxHeXwCl1T5qOlZUDPNoHL94edeOkNc/wxpnvbChnEHpeu1x2H5
-6f4/JlUs9AR8wL3NK4icaU3OPB6tLhiWqqDrciuVmUcWkLVZ7fF4zIsBM0DE6bA/
-7IkEE1ybIgHMJc9AwUD6BKC5t/fYc5F/uH7pgiAf6ZyJJSi1+m+3SogoaFnVMFL5
-5FumtPjk7S8D2FBhmlOGH62qDV/4UrUn3QWCJROg0BA83cBwFSRjiSIO8Fqa+rB1
-Vgaqf7D3mwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVu
-U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUCzcv1kicES8ortxH
-5l46HSQSDxowHwYDVR0jBBgwFoAUsDu8yfooXz4EH5tsx4to2AGw+D0wDQYJKoZI
-hvcNAQELBQADggEBADsKrfInJtTbvJfnTlKLbAhNe+dm7IELDAT4uZI1Esm57dJe
-t6yJZ3J+K09b4zrRCf7ozzOspYSVf0hNr1mHC0xvar9rB68zExn9cA38HJIEvgW5
-lkbVgqT4O7ARLfAZJbrWzhx6F3bGgNJzoBoBSNYLEqk/UGaBG+mfHltv0RkSFHDT
-3kyr04PW5U+7s+XGhxZH91lNnVKdAPAkeh5uFAENBwy2907AQHdl/azHqnN38ESx
-MK1lgxrMvfqdgClh6bMm6DtVxxJ5Pk0x8SHQTl8fc8Ofzvlsfo4REI72YNIRrg8k
-bhBxQgXt6ktBhoaEJnTtRoFINBZA5t9kycJ9axs=
+MIIFMTCCAxmgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNQTESMBAGA1UEBxMJV2FrZWZpZWxkMScwJQYDVQQKEx5UaGUg
+QXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xGjAYBgNVBAsTEUFwYWNoZSBUb21j
+YXQgUE1DMR4wHAYDVQQDExVBcGFjaGUgVG9tY2F0IFRlc3QgQ0EwHhcNMTcwODA4
+MTA0MTA1WhcNMTkwODA4MTA0MTA1WjCBhzELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
+Ak1BMRIwEAYDVQQHEwlXYWtlZmllbGQxJzAlBgNVBAoTHlRoZSBBcGFjaGUgU29m
+dHdhcmUgRm91bmRhdGlvbjEaMBgGA1UECxMRQXBhY2hlIFRvbWNhdCBQTUMxEjAQ
+BgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKgaj3hYJEOdkOHy1WVdYZ0PqAggLIJ1i7DOlrpbmdNrovhUkm0HzLNmhIqLXxzI
+U+uiw1SMztCn/xHa6HiiB+rtWduXdiX3wOhtQwf8/hwigopaXGOCjvtTm0ZHgTSV
+eXUVCo3E2NiE3zBT0G5ALLo74qFETUPez7CeRKEAJo/KOVcUMKdtmszkJLBEHCjT
+wzPB5/cKKmAYYO002F+Goc7H/sxWsGgYRtKgWnAsvc4iG0EFx6KCSbKFoVYUOEYn
+3s30+hMNmoACFNIbR18syQyfcBjhvy+kLnN9zg5uLhFy3TkaNylcx0p7SmZHinBn
+UiSnaypVuoDaKLWLL65I14sCAwEAAaOBmDCBlTAJBgNVHRMEAjAAMCwGCWCGSAGG
++EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU
+AZdqzaRy2LSlPaZ4oWOiPb0B4yIwHwYDVR0jBBgwFoAUAPKYTSEsADxAm4T03irw
+Ju4yDp8wGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUA
+A4ICAQCpQVujS6zDN6TMRIhL20wVnFcIwqeqpoU6al9JDKpsbpV/g5/puQ7jJcnA
+8jFuhaKfikVhoFAezSxShFtJq8JBL+mL4ZR3x5GtwiUFD3PYqefJe41nqmslCoXi
+gq3V0+RidPD2sh/c6vqZxH67jvoHMgNtKbo2nJtdLKs210jHlZZMDSVBfXm0Xgf6
+SyeAFpeTBLHrnt5h4962zGKxDr1Tirqc6nm4MYhTl2pksi2gJ722svz+mF50smJp
+lWV9YzTA3MGAlxZjpwjgbojOOcZ6YtyZ7XJ/fpatB3gMGbgpRsZsL8Lv+CHgZ4Ao
+9tVskwdlSdqZA082ZohxtBYZMfFPY9W3d1Y+Hm0fqCoXYM1hwzSwriIiFDEfDxiX
+sStweBNBcn7NTfGjF9kJvtAJr9QXyl4dex0qLcHLMTZWJsgTrwIPxUWGWKH3MmDR
+uikYuheUj+SeLjxqmGxid6GyoY/4xxgWPCf70l/tgg1JlYYn43M8bbS+y5qPMnyS
+SEjWcsmChMgkuKr8PNANwFLmMbf3nM9wdjoy4QdpuqXztlbsVWwd0bjXQvbAB4dm
+1R2QgX35D2esUY28+WLthU7LI6gGZVEBJypzgAjO4s/z0NFHp4mgJiRLLhkqOnxa
+/LQhAejXdRXtjkgzSax+7mayBiQqd3Dn+6UhjVcn3o/01E96LQ==
-----END CERTIFICATE-----
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem Tue
Dec 18 11:29:28 2018
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC61rIy3hBTH12v
-2tQ/ZLMiN/1OFqPw1p5u0+5H7BW0sw2Av/whlosdQBZtiTUDikWMxm4rZmcPHBnP
-YtXmCEio3xDaTEd5fAKXVPmo6VlQM82gcv3h5146Q1z/DGme9sKGcQel67XHYfnp
-/j8mVSz0BHzAvc0riJxpTc48Hq0uGJaqoOtyK5WZRxaQtVnt8XjMiwEzQMTpsD/s
-iQQTXJsiAcwlz0DBQPoEoLm399hzkX+4fumCIB/pnIklKLX6b7dKiChoWdUwUvnk
-W6a0+OTtLwPYUGGaU4YfraoNX/hStSfdBYIlE6DQEDzdwHAVJGOJIg7wWpr6sHVW
-Bqp/sPebAgMBAAECggEANW/iV5oboSp/aSR1QAxVD5xj3kmrad54QcprhDaJnrz3
-R7OhMRoVf7AsufdcKj8J1VGLgO4w26l12FK0Sq5j2aiy8TyP1LcbJp0vKphS6xVl
-4lYBNvMtiAxsNKYgL070I+9/+HyJ6RSkncAR36zMxp3h8F5Yp/LSiWuvaJJ9hYkU
-sH+svdnh3nvgNAnKHMEMRs+++CFZ5QL1Iv4WANTRyO3+ylDrwmWlNjzcwae1/789
-EaP5RX08E/yGJFwCFbpK04mZjwQZV3PS5V+TPCnVXLyAGFhBY8a5Faya9uNLItJ/
-oRJhqqMiUgUk3E6dpbSkM6SL0YHMv6jQuGXISDblgQKBgQD4ZBONARsaedr5jKPH
-HOCBSq2D2ROiv43DDl9a8LLjEHTwt5vjB7jYI5G1vGXXNOSYxNtBvtl6Jhzralmx
-TA282lV0Kr2xidZjpsbJb0Nwvw/bRS5GzwLv3eHt675zl9R2GJpqxnTxT2qyxHql
-RUJrCOwi6dmRMnCfBR72OccNYwKBgQDAj+qbVYybIaNq660T+9qKW1mkJE5SQxbg
-buPwK5V4Sl6ItxUEhZ0BtAO4gM76Qm2S6uJU7CkEJidNvPbrhv0fSgFbgwXmTlnr
-OtDzLs3MX7N4RQGhWXZvMMhWzFJGsfNYO7ReUjUuLPWkvR4ag5Y58dUfn5y0icj0
-kKAE73++aQKBgEzYESBXTj5DopX/h4+LBH2bT9DxcFyyLDZDFQb6Xi1XIwZxlz2G
-Xw4m+uYhcdRBXdNRW4+cboWWku3VygfKwplBZpx4uJTbUsMjjm41CMUxpsMsROPN
-GViB6WqEuzfhqe4bMHKGERmyewzxMgw9QA4DBaLLe+6qjyLzH6AHQeiHAoGANvWc
-f0M2g1xhePXVC1wZrt2NwzR9iisNz3a25eh6m7+WJa0jeYvtGPxZB4L0ECd/gKw7
-dwOEXWPKWfyx+N0pR5Hmu0i1GVuJfILn+lCEem1iGtSPN48CJ5Ajzeo5HWZSzv8T
-ZsxN02UPozo66lRePyGPs5vprPmaensAwQfeTOkCgYBaaJ6LC9slX4vEw28fO3xU
-4UbRKik4A3EbUlklXBXPY1eCDzI9r5IuiXD3aM/V3qeO7PGBUwW75Glu+fmmKXP8
-5R8beykoudKtiRTLIaEZHRfTNnaGmThDI0RrjkmKHt7AC5MBDTwajVL89T1H6Y0H
-tlo5AYv9klQDtpadOUZbhg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCoGo94WCRDnZDh
+8tVlXWGdD6gIICyCdYuwzpa6W5nTa6L4VJJtB8yzZoSKi18cyFProsNUjM7Qp/8R
+2uh4ogfq7Vnbl3Yl98DobUMH/P4cIoKKWlxjgo77U5tGR4E0lXl1FQqNxNjYhN8w
+U9BuQCy6O+KhRE1D3s+wnkShACaPyjlXFDCnbZrM5CSwRBwo08Mzwef3CipgGGDt
+NNhfhqHOx/7MVrBoGEbSoFpwLL3OIhtBBceigkmyhaFWFDhGJ97N9PoTDZqAAhTS
+G0dfLMkMn3AY4b8vpC5zfc4Obi4Rct05GjcpXMdKe0pmR4pwZ1Ikp2sqVbqA2ii1
+iy+uSNeLAgMBAAECggEABni3Sz/BbaT0Pe6WToewyVYf9ugeLouN7CmX3ebG3j/H
+j13aIT5qoAFzWs4QxE/mAy1J7chZ8eh1xl8yEerS+TVX/z8uejm2gHwsV3Ni6Pxf
+ICpoYiBVltFaKfN4wuh6O4qq1FherL84xGiFnqjzz9ucVu8FNnaucjM1mykhUum7
+IGFgLAd/84FM3JJ62jqVdJsUm3UWyIjoauDUQyaTzA1g+W+L0/wmPVsIs3zzl4U2
+B8zgs0ZfffaaOvxnuRxUU8y1bgTa4fgPa2T/wXAHcOZ8b9yhHqETYV1OAVc1L0U+
+VbUO/rzqjknSKFyRm/ON9wUCVSSQb8mg6J61L6oWwQKBgQDP+06IRf2DhRDoqi3D
+Uc/MoOX0XL2lZpCSwAMv3Wtif71FSxVK6ANVfCLcjsofOPUo6pvs2EvdWIeY/ngw
+W0NQ153AC/IZSgLxW36fa43aBeR+b+vryVP0PRd++IIdL7rvP6YO/Yy8nF63rJax
+ptSkiz8SG/xxtCf7NVjVsBwXqwKBgQDO6kgWbkGFERvy4R5r1/xincNgBA7NqbUq
+bmlzV4G72ILbt8qnZk/FQAnQa9Iff69Gc78jHroMiHRSqE/159ftodDCoRrN7/2T
+vZiVCNlkBjr14uQSLmKxfhEkGY2mFyXbnS5G1a01em1LlC0Ld8Y7Sio28qisgWa3
+rEWmXADfoQKBgQCsqR3mJeyzrdl+viDlwNp5L64X8pICaSZmnf9HUlNe31s61n1j
+xT9XTYoHfocv6nIkuLgfpOU+acuQaNlQk8NLruSoVYJ0GixdQK7bHEgUEsZBbRr3
+kRkgb0M9RoOGRWS0UCvE0BtxTYOYijBEZZKs02jV2OP3ZS+37e7E38JCpwKBgQC1
+pqo4vvzYVGfj90ycwtY4wWXnYkiYt1dr89ixwO4NOovPVvAbvE9lzM2Q40dqDc+T
+m0P/EhelrxnoAwmHyc0gOsIqTANbLkjBLl7I4CbxkCKtAU7Ww1AzoIht190qJgI/
+ZiNdXnOckmlnQ6O0AKfQH1EmQixgnY3Oy/etj/HYYQKBgDhHmCBve3zvy7kagEe1
+Bu0F9FONAVF3aoWdMm9lqQJJjCgY1YJhSV/WdoC22nwtHwkVGeyeuySDYvFiHF63
+eDC+A5oXfrgwEHsHOeSH5jH1P1c9xvCEmfM+U04McP8DV+++o665QKkh8EOGOABG
++FfSBZZVtGY+7cqmlmssQnjN
-----END PRIVATE KEY-----
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost.jks
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost.jks?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/user1.jks
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/user1.jks?rev=1849168&r1=1849167&r2=1849168&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
