From 9fd20b06664b0f51c720173825cd3725a8c8d2f8 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xensource.com>
Date: Tue, 10 Oct 2006 10:06:56 +0100
Subject: Correct check for extended-cr3 support in __xen_guest fallback code.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
---
 tools/libxc/xc_load_elf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/libxc/xc_load_elf.c')

diff --git a/tools/libxc/xc_load_elf.c b/tools/libxc/xc_load_elf.c
index 3fbd3d9ccc..9ca9759398 100644
--- a/tools/libxc/xc_load_elf.c
+++ b/tools/libxc/xc_load_elf.c
@@ -364,7 +364,7 @@ static int parseelfimage(const char *image,
         if ( p != NULL && strncmp(p, "yes", 3) == 0 )
         {
             dsi->pae_kernel = PAEKERN_yes;
-            if ( !strncmp(p+4, "[extended-cr3]", 14) )
+            if ( !strncmp(p+3, "[extended-cr3]", 14) )
                 dsi->pae_kernel = PAEKERN_extended_cr3;
         }
     }
-- 
cgit v1.2.3

a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='68150d3125447a40cf103aeefd9bcb6c874e6769'/><select name='h' onchange='this.form.submit();'>
<option value='attitude_adjustment'>attitude_adjustment</option>
<option value='barrier_breaker'>barrier_breaker</option>
<option value='chaos_calmer'>chaos_calmer</option>
<option value='lede-17.01'>lede-17.01</option>
<option value='less-old-master'>less-old-master</option>
<option value='master'>master</option>
<option value='old-master'>old-master</option>
<option value='openwrt-18.06'>openwrt-18.06</option>
<option value='openwrt-19.07'>openwrt-19.07</option>
<option value='upstream'>upstream</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>upstream openwrt</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/openwrt/upstream/about/?h=v23.05.1'>about</a><a href='/cgit/openwrt/upstream/?h=v23.05.1'>summary</a><a href='/cgit/openwrt/upstream/refs/?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>refs</a><a href='/cgit/openwrt/upstream/log/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1'>log</a><a class='active' href='/cgit/openwrt/upstream/tree/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>tree</a><a href='/cgit/openwrt/upstream/commit/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>commit</a><a href='/cgit/openwrt/upstream/diff/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>diff</a><a href='/cgit/openwrt/upstream/stats/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/openwrt/upstream/log/tools/mkimage/patches/210-openssl-1.1.x-compat.patch'>
<input type='hidden' name='h' value='v23.05.1'/><input type='hidden' name='id' value='68150d3125447a40cf103aeefd9bcb6c874e6769'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/openwrt/upstream/tree/?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>root</a>/<a href='/cgit/openwrt/upstream/tree/tools?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>tools</a>/<a href='/cgit/openwrt/upstream/tree/tools/mkimage?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>mkimage</a>/<a href='/cgit/openwrt/upstream/tree/tools/mkimage/patches?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>patches</a>/<a href='/cgit/openwrt/upstream/tree/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>210-openssl-1.1.x-compat.patch</a></div><div class='content'>blob: b1bc08856ea13b04d2aba58b551c3dcf2f1d2a0b (<a href='/cgit/openwrt/upstream/plain/tools/mkimage/patches/210-openssl-1.1.x-compat.patch?h=v23.05.1&amp;id=68150d3125447a40cf103aeefd9bcb6c874e6769'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; margin: 0; }
td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight { background: #ffffff; }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="gd">--- a/lib/rsa/rsa-sign.c</span>
<span class="gi">+++ b/lib/rsa/rsa-sign.c</span>
<span class="gu">@@ -15,10 +15,25 @@</span>
 #include &lt;openssl/ssl.h&gt;
 #include &lt;openssl/evp.h&gt;
 
<span class="gd">-#if OPENSSL_VERSION_NUMBER &gt;= 0x10000000L</span>
<span class="gi">+#if OPENSSL_VERSION_NUMBER &lt; 0x10000000L</span>
<span class="gi">+#define HAVE_ERR_REMOVE_STATE</span>
<span class="gi">+#elif OPENSSL_VERSION_NUMBER &lt; 0x10100000L</span>
 #define HAVE_ERR_REMOVE_THREAD_STATE
 #endif
 
<span class="gi">+#if (OPENSSL_VERSION_NUMBER &lt; 0x10100005L) || defined(LIBRESSL_VERSION_NUMBER)</span>
<span class="gi">+static void RSA_get0_key(const RSA *r,</span>
<span class="gi">+                         const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)</span>
<span class="gi">+{</span>
<span class="gi">+   if (n != NULL)</span>
<span class="gi">+       *n = r-&gt;n;</span>
<span class="gi">+   if (e != NULL)</span>
<span class="gi">+       *e = r-&gt;e;</span>
<span class="gi">+   if (d != NULL)</span>
<span class="gi">+       *d = r-&gt;d;</span>
<span class="gi">+}</span>
<span class="gi">+#endif</span>
<span class="gi">+</span>
 static int rsa_err(const char *msg)
 {
 	unsigned long sslErr = ERR_get_error();
<span class="gu">@@ -154,7 +169,8 @@ static void rsa_remove(void)</span>
 	ERR_free_strings();
 #ifdef HAVE_ERR_REMOVE_THREAD_STATE
 	ERR_remove_thread_state(NULL);
<span class="gd">-#else</span>
<span class="gi">+#endif</span>
<span class="gi">+#ifdef HAVE_ERR_REMOVE_STATE</span>
 	ERR_remove_state(0);
 #endif
 	EVP_cleanup();
<span class="gu">@@ -210,7 +226,6 @@ static int rsa_sign_with_key(RSA *rsa, s</span>
 		ret = rsa_err(&quot;Could not obtain signature&quot;);
 		goto err_sign;
 	}
<span class="gd">-	EVP_MD_CTX_cleanup(context);</span>
 	EVP_MD_CTX_destroy(context);
 	EVP_PKEY_free(key);
 
<span class="gu">@@ -270,23 +285,26 @@ static int rsa_get_exponent(RSA *key, ui</span>
 	BIGNUM *bn_te;
 	uint64_t te;
 
<span class="gi">+	const BIGNUM *bn_e;</span>
<span class="gi">+	RSA_get0_key(key, NULL, &amp;bn_e, NULL);</span>
<span class="gi">+</span>
 	ret = -EINVAL;
 	bn_te = NULL;
 
 	if (!e)
 		goto cleanup;
 
<span class="gd">-	if (BN_num_bits(key-&gt;e) &gt; 64)</span>
<span class="gi">+	if (BN_num_bits(bn_e) &gt; 64)</span>
 		goto cleanup;
 
<span class="gd">-	*e = BN_get_word(key-&gt;e);</span>
<span class="gi">+	*e = BN_get_word(bn_e);</span>
 
<span class="gd">-	if (BN_num_bits(key-&gt;e) &lt; 33) {</span>
<span class="gi">+	if (BN_num_bits(bn_e) &lt; 33) {</span>
 		ret = 0;
 		goto cleanup;
 	}
 
<span class="gd">-	bn_te = BN_dup(key-&gt;e);</span>
<span class="gi">+	bn_te = BN_dup(bn_e);</span>
 	if (!bn_te)
 		goto cleanup;
 
<span class="gu">@@ -319,6 +337,9 @@ int rsa_get_params(RSA *key, uint64_t *e</span>
 	BN_CTX *bn_ctx = BN_CTX_new();
 	int ret = 0;
 
<span class="gi">+	const BIGNUM *bn_n;</span>
<span class="gi">+	RSA_get0_key(key, &amp;bn_n, NULL, NULL);</span>
<span class="gi">+</span>
 	/* Initialize BIGNUMs */
 	big1 = BN_new();
 	big2 = BN_new();
<span class="gu">@@ -337,7 +358,7 @@ int rsa_get_params(RSA *key, uint64_t *e</span>
 	if (0 != rsa_get_exponent(key, exponent))
 		ret = -1;
 
<span class="gd">-	if (!BN_copy(n, key-&gt;n) || !BN_set_word(big1, 1L) ||</span>
<span class="gi">+	if (!BN_copy(n, bn_n) || !BN_set_word(big1, 1L) ||</span>
 	    !BN_set_word(big2, 2L) || !BN_set_word(big32, 32L))
 		ret = -1;
 
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.25.1</a>) at 2025-03-09 20:41:06 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
