| 1 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| 2 |
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 3 |
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
| 4 |
<head> |
| 5 |
<title>rpms/java-1.8.0-openjdk.git - java-1.8.0-openjdk</title> |
| 6 |
<meta name='generator' content='cgit v0.12'/> |
| 7 |
<meta name='robots' content='index, nofollow'/> |
| 8 |
<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> |
| 9 |
<link rel='shortcut icon' href='/favicon.ico'/> |
| 10 |
<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/atom/pr3083-rh1346460.patch?h=f24' type='application/atom+xml'/> |
| 11 |
<link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/> |
| 12 |
<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/> |
| 13 |
<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/> |
| 14 |
</head> |
| 15 |
<body> |
| 16 |
<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> |
| 17 |
<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> |
| 18 |
|
| 19 |
<script> |
| 20 |
var base = 'https://apps.fedoraproject.org/'; |
| 21 |
var tokens = window.location.href.split('/'); |
| 22 |
var repo = null; |
| 23 |
if (tokens.length > 4 && tokens[4] != '') { |
| 24 |
repo = tokens[4].split('.')[0]; |
| 25 |
} |
| 26 |
fedmenu({ |
| 27 |
'url': base + 'js/data.js', |
| 28 |
'mimeType': 'application/javascript', |
| 29 |
'position': 'bottom-right', |
| 30 |
'package': repo, |
| 31 |
}); |
| 32 |
</script> |
| 33 |
<div id='cgit'><table id='header'> |
| 34 |
<tr> |
| 35 |
<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> |
| 36 |
<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/java-1.8.0-openjdk.git' href='/cgit/rpms/java-1.8.0-openjdk.git/'>rpms/java-1.8.0-openjdk.git</a></td><td class='form'><form method='get' action=''> |
| 37 |
<select name='h' onchange='this.form.submit();'> |
| 38 |
<option value='f19'>f19</option> |
| 39 |
<option value='f20'>f20</option> |
| 40 |
<option value='f21'>f21</option> |
| 41 |
<option value='f22'>f22</option> |
| 42 |
<option value='f23'>f23</option> |
| 43 |
<option value='f24' selected='selected'>f24</option> |
| 44 |
<option value='f25'>f25</option> |
| 45 |
<option value='master'>master</option> |
| 46 |
</select> <input type='submit' name='' value='switch'/></form></td></tr> |
| 47 |
<tr><td class='sub'>java-1.8.0-openjdk</td><td class='sub right'>Jon Ciesla</td></tr></table> |
| 48 |
<table class='tabs'><tr><td> |
| 49 |
<a href='/cgit/rpms/java-1.8.0-openjdk.git/?h=f24'>summary</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/refs/?h=f24'>refs</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/log/pr3083-rh1346460.patch?h=f24'>log</a><a class='active' href='/cgit/rpms/java-1.8.0-openjdk.git/tree/pr3083-rh1346460.patch?h=f24'>tree</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/commit/pr3083-rh1346460.patch?h=f24'>commit</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/diff/pr3083-rh1346460.patch?h=f24'>diff</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/stats/pr3083-rh1346460.patch?h=f24'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/java-1.8.0-openjdk.git/log/pr3083-rh1346460.patch'> |
| 50 |
<input type='hidden' name='h' value='f24'/><select name='qt'> |
| 51 |
<option value='grep'>log msg</option> |
| 52 |
<option value='author'>author</option> |
| 53 |
<option value='committer'>committer</option> |
| 54 |
<option value='range'>range</option> |
| 55 |
</select> |
| 56 |
<input class='txt' type='text' size='10' name='q' value=''/> |
| 57 |
<input type='submit' value='search'/> |
| 58 |
</form> |
| 59 |
</td></tr></table> |
| 60 |
<div class='path'>path: <a href='/cgit/rpms/java-1.8.0-openjdk.git/tree/?h=f24'>root</a>/<a href='/cgit/rpms/java-1.8.0-openjdk.git/tree/pr3083-rh1346460.patch?h=f24'>pr3083-rh1346460.patch</a></div><div class='content'>blob: d44ed1d532b4d1effef7503eaa640837f29a5a43 (<a href='/cgit/rpms/java-1.8.0-openjdk.git/plain/pr3083-rh1346460.patch?h=f24'>plain</a>) |
| 61 |
<table summary='blob content' class='blob'> |
| 62 |
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> |
| 63 |
<a id='n2' href='#n2'>2</a> |
| 64 |
<a id='n3' href='#n3'>3</a> |
| 65 |
<a id='n4' href='#n4'>4</a> |
| 66 |
<a id='n5' href='#n5'>5</a> |
| 67 |
<a id='n6' href='#n6'>6</a> |
| 68 |
<a id='n7' href='#n7'>7</a> |
| 69 |
<a id='n8' href='#n8'>8</a> |
| 70 |
<a id='n9' href='#n9'>9</a> |
| 71 |
<a id='n10' href='#n10'>10</a> |
| 72 |
<a id='n11' href='#n11'>11</a> |
| 73 |
<a id='n12' href='#n12'>12</a> |
| 74 |
<a id='n13' href='#n13'>13</a> |
| 75 |
<a id='n14' href='#n14'>14</a> |
| 76 |
<a id='n15' href='#n15'>15</a> |
| 77 |
<a id='n16' href='#n16'>16</a> |
| 78 |
<a id='n17' href='#n17'>17</a> |
| 79 |
<a id='n18' href='#n18'>18</a> |
| 80 |
<a id='n19' href='#n19'>19</a> |
| 81 |
<a id='n20' href='#n20'>20</a> |
| 82 |
<a id='n21' href='#n21'>21</a> |
| 83 |
<a id='n22' href='#n22'>22</a> |
| 84 |
<a id='n23' href='#n23'>23</a> |
| 85 |
<a id='n24' href='#n24'>24</a> |
| 86 |
<a id='n25' href='#n25'>25</a> |
| 87 |
<a id='n26' href='#n26'>26</a> |
| 88 |
<a id='n27' href='#n27'>27</a> |
| 89 |
<a id='n28' href='#n28'>28</a> |
| 90 |
<a id='n29' href='#n29'>29</a> |
| 91 |
<a id='n30' href='#n30'>30</a> |
| 92 |
<a id='n31' href='#n31'>31</a> |
| 93 |
<a id='n32' href='#n32'>32</a> |
| 94 |
<a id='n33' href='#n33'>33</a> |
| 95 |
<a id='n34' href='#n34'>34</a> |
| 96 |
<a id='n35' href='#n35'>35</a> |
| 97 |
<a id='n36' href='#n36'>36</a> |
| 98 |
<a id='n37' href='#n37'>37</a> |
| 99 |
<a id='n38' href='#n38'>38</a> |
| 100 |
<a id='n39' href='#n39'>39</a> |
| 101 |
<a id='n40' href='#n40'>40</a> |
| 102 |
<a id='n41' href='#n41'>41</a> |
| 103 |
<a id='n42' href='#n42'>42</a> |
| 104 |
<a id='n43' href='#n43'>43</a> |
| 105 |
<a id='n44' href='#n44'>44</a> |
| 106 |
<a id='n45' href='#n45'>45</a> |
| 107 |
<a id='n46' href='#n46'>46</a> |
| 108 |
<a id='n47' href='#n47'>47</a> |
| 109 |
<a id='n48' href='#n48'>48</a> |
| 110 |
<a id='n49' href='#n49'>49</a> |
| 111 |
<a id='n50' href='#n50'>50</a> |
| 112 |
<a id='n51' href='#n51'>51</a> |
| 113 |
<a id='n52' href='#n52'>52</a> |
| 114 |
<a id='n53' href='#n53'>53</a> |
| 115 |
<a id='n54' href='#n54'>54</a> |
| 116 |
<a id='n55' href='#n55'>55</a> |
| 117 |
<a id='n56' href='#n56'>56</a> |
| 118 |
<a id='n57' href='#n57'>57</a> |
| 119 |
<a id='n58' href='#n58'>58</a> |
| 120 |
<a id='n59' href='#n59'>59</a> |
| 121 |
<a id='n60' href='#n60'>60</a> |
| 122 |
<a id='n61' href='#n61'>61</a> |
| 123 |
<a id='n62' href='#n62'>62</a> |
| 124 |
<a id='n63' href='#n63'>63</a> |
| 125 |
<a id='n64' href='#n64'>64</a> |
| 126 |
<a id='n65' href='#n65'>65</a> |
| 127 |
<a id='n66' href='#n66'>66</a> |
| 128 |
<a id='n67' href='#n67'>67</a> |
| 129 |
<a id='n68' href='#n68'>68</a> |
| 130 |
<a id='n69' href='#n69'>69</a> |
| 131 |
<a id='n70' href='#n70'>70</a> |
| 132 |
<a id='n71' href='#n71'>71</a> |
| 133 |
<a id='n72' href='#n72'>72</a> |
| 134 |
<a id='n73' href='#n73'>73</a> |
| 135 |
<a id='n74' href='#n74'>74</a> |
| 136 |
<a id='n75' href='#n75'>75</a> |
| 137 |
<a id='n76' href='#n76'>76</a> |
| 138 |
<a id='n77' href='#n77'>77</a> |
| 139 |
<a id='n78' href='#n78'>78</a> |
| 140 |
<a id='n79' href='#n79'>79</a> |
| 141 |
<a id='n80' href='#n80'>80</a> |
| 142 |
<a id='n81' href='#n81'>81</a> |
| 143 |
<a id='n82' href='#n82'>82</a> |
| 144 |
<a id='n83' href='#n83'>83</a> |
| 145 |
<a id='n84' href='#n84'>84</a> |
| 146 |
<a id='n85' href='#n85'>85</a> |
| 147 |
<a id='n86' href='#n86'>86</a> |
| 148 |
<a id='n87' href='#n87'>87</a> |
| 149 |
<a id='n88' href='#n88'>88</a> |
| 150 |
<a id='n89' href='#n89'>89</a> |
| 151 |
<a id='n90' href='#n90'>90</a> |
| 152 |
<a id='n91' href='#n91'>91</a> |
| 153 |
<a id='n92' href='#n92'>92</a> |
| 154 |
<a id='n93' href='#n93'>93</a> |
| 155 |
<a id='n94' href='#n94'>94</a> |
| 156 |
<a id='n95' href='#n95'>95</a> |
| 157 |
<a id='n96' href='#n96'>96</a> |
| 158 |
<a id='n97' href='#n97'>97</a> |
| 159 |
<a id='n98' href='#n98'>98</a> |
| 160 |
<a id='n99' href='#n99'>99</a> |
| 161 |
<a id='n100' href='#n100'>100</a> |
| 162 |
<a id='n101' href='#n101'>101</a> |
| 163 |
<a id='n102' href='#n102'>102</a> |
| 164 |
<a id='n103' href='#n103'>103</a> |
| 165 |
<a id='n104' href='#n104'>104</a> |
| 166 |
<a id='n105' href='#n105'>105</a> |
| 167 |
<a id='n106' href='#n106'>106</a> |
| 168 |
<a id='n107' href='#n107'>107</a> |
| 169 |
<a id='n108' href='#n108'>108</a> |
| 170 |
<a id='n109' href='#n109'>109</a> |
| 171 |
<a id='n110' href='#n110'>110</a> |
| 172 |
<a id='n111' href='#n111'>111</a> |
| 173 |
<a id='n112' href='#n112'>112</a> |
| 174 |
<a id='n113' href='#n113'>113</a> |
| 175 |
<a id='n114' href='#n114'>114</a> |
| 176 |
<a id='n115' href='#n115'>115</a> |
| 177 |
<a id='n116' href='#n116'>116</a> |
| 178 |
<a id='n117' href='#n117'>117</a> |
| 179 |
<a id='n118' href='#n118'>118</a> |
| 180 |
<a id='n119' href='#n119'>119</a> |
| 181 |
<a id='n120' href='#n120'>120</a> |
| 182 |
<a id='n121' href='#n121'>121</a> |
| 183 |
<a id='n122' href='#n122'>122</a> |
| 184 |
<a id='n123' href='#n123'>123</a> |
| 185 |
<a id='n124' href='#n124'>124</a> |
| 186 |
<a id='n125' href='#n125'>125</a> |
| 187 |
<a id='n126' href='#n126'>126</a> |
| 188 |
<a id='n127' href='#n127'>127</a> |
| 189 |
<a id='n128' href='#n128'>128</a> |
| 190 |
<a id='n129' href='#n129'>129</a> |
| 191 |
<a id='n130' href='#n130'>130</a> |
| 192 |
<a id='n131' href='#n131'>131</a> |
| 193 |
<a id='n132' href='#n132'>132</a> |
| 194 |
<a id='n133' href='#n133'>133</a> |
| 195 |
<a id='n134' href='#n134'>134</a> |
| 196 |
<a id='n135' href='#n135'>135</a> |
| 197 |
<a id='n136' href='#n136'>136</a> |
| 198 |
<a id='n137' href='#n137'>137</a> |
| 199 |
<a id='n138' href='#n138'>138</a> |
| 200 |
<a id='n139' href='#n139'>139</a> |
| 201 |
<a id='n140' href='#n140'>140</a> |
| 202 |
<a id='n141' href='#n141'>141</a> |
| 203 |
<a id='n142' href='#n142'>142</a> |
| 204 |
<a id='n143' href='#n143'>143</a> |
| 205 |
<a id='n144' href='#n144'>144</a> |
| 206 |
<a id='n145' href='#n145'>145</a> |
| 207 |
<a id='n146' href='#n146'>146</a> |
| 208 |
<a id='n147' href='#n147'>147</a> |
| 209 |
<a id='n148' href='#n148'>148</a> |
| 210 |
<a id='n149' href='#n149'>149</a> |
| 211 |
<a id='n150' href='#n150'>150</a> |
| 212 |
<a id='n151' href='#n151'>151</a> |
| 213 |
<a id='n152' href='#n152'>152</a> |
| 214 |
</pre></td> |
| 215 |
<td class='lines'><pre><code># HG changeset patch |
| 216 |
# User andrew |
| 217 |
# Date 1467652889 -3600 |
| 218 |
# Mon Jul 04 18:21:29 2016 +0100 |
| 219 |
# Node ID a4541d1d8609cadb08d3e31b40b9184ff32dd6c3 |
| 220 |
# Parent bc6eab2038c603afb2eb2b4644f3b900c8fd0c46 |
| 221 |
PR3083, RH1346460: Regression in SSL debug output without an ECC provider |
| 222 |
Summary: Return null rather than throwing an exception when there's no ECC provider. |
| 223 |
|
| 224 |
diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java |
| 225 |
--- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100 |
| 226 |
+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100 |
| 227 |
@@ -73,6 +73,7 @@ |
| 228 |
System.err.println("certpath PKIX CertPathBuilder and"); |
| 229 |
System.err.println(" CertPathValidator debugging"); |
| 230 |
System.err.println("combiner SubjectDomainCombiner debugging"); |
| 231 |
+ System.err.println("ecc Elliptic Curve Cryptography debugging"); |
| 232 |
System.err.println("gssloginconfig"); |
| 233 |
System.err.println(" GSS LoginConfigImpl debugging"); |
| 234 |
System.err.println("configfile JAAS ConfigFile loading"); |
| 235 |
diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java |
| 236 |
--- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100 |
| 237 |
+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100 |
| 238 |
@@ -41,6 +41,9 @@ |
| 239 |
|
| 240 |
public class ECUtil { |
| 241 |
|
| 242 |
+ /* Are we debugging ? */ |
| 243 |
+ private static final Debug debug = Debug.getInstance("ecc"); |
| 244 |
+ |
| 245 |
// Used by SunPKCS11 and SunJSSE. |
| 246 |
public static ECPoint decodePoint(byte[] data, EllipticCurve curve) |
| 247 |
throws IOException { |
| 248 |
@@ -90,6 +93,10 @@ |
| 249 |
} |
| 250 |
|
| 251 |
private static AlgorithmParameters getECParameters(Provider p) { |
| 252 |
+ return getECParameters(p, false); |
| 253 |
+ } |
| 254 |
+ |
| 255 |
+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) { |
| 256 |
try { |
| 257 |
if (p != null) { |
| 258 |
return AlgorithmParameters.getInstance("EC", p); |
| 259 |
@@ -97,13 +104,21 @@ |
| 260 |
|
| 261 |
return AlgorithmParameters.getInstance("EC"); |
| 262 |
} catch (NoSuchAlgorithmException nsae) { |
| 263 |
- throw new RuntimeException(nsae); |
| 264 |
+ if (throwException) { |
| 265 |
+ throw new RuntimeException(nsae); |
| 266 |
+ } else { |
| 267 |
+ // ECC provider is optional so just return null |
| 268 |
+ if (debug != null) { |
| 269 |
+ debug.println("Provider unavailable: " + nsae); |
| 270 |
+ } |
| 271 |
+ return null; |
| 272 |
+ } |
| 273 |
} |
| 274 |
} |
| 275 |
|
| 276 |
public static byte[] encodeECParameterSpec(Provider p, |
| 277 |
ECParameterSpec spec) { |
| 278 |
- AlgorithmParameters parameters = getECParameters(p); |
| 279 |
+ AlgorithmParameters parameters = getECParameters(p, true); |
| 280 |
|
| 281 |
try { |
| 282 |
parameters.init(spec); |
| 283 |
@@ -122,11 +137,16 @@ |
| 284 |
public static ECParameterSpec getECParameterSpec(Provider p, |
| 285 |
ECParameterSpec spec) { |
| 286 |
AlgorithmParameters parameters = getECParameters(p); |
| 287 |
+ if (parameters == null) |
| 288 |
+ return null; |
| 289 |
|
| 290 |
try { |
| 291 |
parameters.init(spec); |
| 292 |
return parameters.getParameterSpec(ECParameterSpec.class); |
| 293 |
} catch (InvalidParameterSpecException ipse) { |
| 294 |
+ if (debug != null) { |
| 295 |
+ debug.println("Invalid parameter specification: " + ipse); |
| 296 |
+ } |
| 297 |
return null; |
| 298 |
} |
| 299 |
} |
| 300 |
@@ -135,34 +155,49 @@ |
| 301 |
byte[] params) |
| 302 |
throws IOException { |
| 303 |
AlgorithmParameters parameters = getECParameters(p); |
| 304 |
+ if (parameters == null) |
| 305 |
+ return null; |
| 306 |
|
| 307 |
parameters.init(params); |
| 308 |
|
| 309 |
try { |
| 310 |
return parameters.getParameterSpec(ECParameterSpec.class); |
| 311 |
} catch (InvalidParameterSpecException ipse) { |
| 312 |
+ if (debug != null) { |
| 313 |
+ debug.println("Invalid parameter specification: " + ipse); |
| 314 |
+ } |
| 315 |
return null; |
| 316 |
} |
| 317 |
} |
| 318 |
|
| 319 |
public static ECParameterSpec getECParameterSpec(Provider p, String name) { |
| 320 |
AlgorithmParameters parameters = getECParameters(p); |
| 321 |
+ if (parameters == null) |
| 322 |
+ return null; |
| 323 |
|
| 324 |
try { |
| 325 |
parameters.init(new ECGenParameterSpec(name)); |
| 326 |
return parameters.getParameterSpec(ECParameterSpec.class); |
| 327 |
} catch (InvalidParameterSpecException ipse) { |
| 328 |
+ if (debug != null) { |
| 329 |
+ debug.println("Invalid parameter specification: " + ipse); |
| 330 |
+ } |
| 331 |
return null; |
| 332 |
} |
| 333 |
} |
| 334 |
|
| 335 |
public static ECParameterSpec getECParameterSpec(Provider p, int keySize) { |
| 336 |
AlgorithmParameters parameters = getECParameters(p); |
| 337 |
+ if (parameters == null) |
| 338 |
+ return null; |
| 339 |
|
| 340 |
try { |
| 341 |
parameters.init(new ECKeySizeParameterSpec(keySize)); |
| 342 |
return parameters.getParameterSpec(ECParameterSpec.class); |
| 343 |
} catch (InvalidParameterSpecException ipse) { |
| 344 |
+ if (debug != null) { |
| 345 |
+ debug.println("Invalid parameter specification: " + ipse); |
| 346 |
+ } |
| 347 |
return null; |
| 348 |
} |
| 349 |
|
| 350 |
@@ -171,11 +206,16 @@ |
| 351 |
public static String getCurveName(Provider p, ECParameterSpec spec) { |
| 352 |
ECGenParameterSpec nameSpec; |
| 353 |
AlgorithmParameters parameters = getECParameters(p); |
| 354 |
+ if (parameters == null) |
| 355 |
+ return null; |
| 356 |
|
| 357 |
try { |
| 358 |
parameters.init(spec); |
| 359 |
nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class); |
| 360 |
} catch (InvalidParameterSpecException ipse) { |
| 361 |
+ if (debug != null) { |
| 362 |
+ debug.println("Invalid parameter specification: " + ipse); |
| 363 |
+ } |
| 364 |
return null; |
| 365 |
} |
| 366 |
|
| 367 |
</code></pre></td></tr></table> |
| 368 |
</div> <!-- class=content --> |
| 369 |
<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-07-28 17:17:08 (GMT)</div> |
| 370 |
</div> <!-- id=cgit --> |
| 371 |
</body> |
| 372 |
</html> |
Parent Directory
| 
Revision Log