<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Eric S. Raymond pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/297b519ba6f6dbd9d2882952569f7e469aec6915">297b519b</a></strong>
<div>
<span>by Matt Selsky</span>
<i>at 2016-11-28T19:58:06-05:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Make sure fetch_nonce() returns a string (not bytes)
...otherwise we send a b'' around the nonce in the response with Python3.
Fixes GitLab issue #170
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#e0397ae65951b0adbbedbbb14a096009aaa63642" style="text-decoration: none">
pylib/packet.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="e0397ae65951b0adbbedbbb14a096009aaa63642">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/297b519ba6f6dbd9d2882952569f7e469aec6915#e0397ae65951b0adbbedbbb14a096009aaa63642"><strong>pylib/packet.py</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 13px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.5">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1172" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1172" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -1172,7 +1172,7 @@ class ControlSession:</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="1172" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1172
</td>
<td class="diff-line-num new_line" data-linenumber="1172" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1172
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"><span id="LC1172" class="line"> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">doquery</span><span class="p">(</span><span class="n" style="color: #333">opcode</span><span class="o" style="font-weight: bold">=</span><span class="n" style="color: #333">CTL_OP_REQ_NONCE</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="1173" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1173
</td>
<td class="diff-line-num new_line" data-linenumber="1173" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1173
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"><span id="LC1173" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="ow" style="font-weight: bold">not</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">response</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">startswith</span><span class="p">(</span><span class="n" style="color: #333">polybytes</span><span class="p">(</span><span class="s" style="color: #d14">"nonce="</span><span class="p">)):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="1174" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1174
</td>
<td class="diff-line-num new_line" data-linenumber="1174" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1174
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"><span id="LC1174" class="line"> <span class="k" style="font-weight: bold">raise</span> <span class="n" style="color: #333">ControlException</span><span class="p">(</span><span class="n" style="color: #333">SERR_BADNONCE</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.5">
<td class="diff-line-num old old_line" data-linenumber="1175" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
1175
</td>
<td class="diff-line-num new_line old" data-linenumber="1175" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0"><span id="LC1175" class="line"> <span class="k" style="font-weight: bold">return</span> <span class="bp" style="color: #999"><span class="idiff left">self</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">response</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">strip</span></span><span class="p"><span class="idiff right">(</span>)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="1176" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1175" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1175
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0"><span id="LC1175" class="line"> <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333"><span class="idiff left">polystr</span></span><span class="p"><span class="idiff">(</span></span><span class="bp" style="color: #999"><span class="idiff">self</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">response</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">strip</span></span><span class="p"><span class="idiff right">()</span>)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="1176" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1176
</td>
<td class="diff-line-num new_line" data-linenumber="1176" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1176
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"><span id="LC1176" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="1177" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1177
</td>
<td class="diff-line-num new_line" data-linenumber="1177" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1177
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"><span id="LC1177" class="line"> <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">mrulist</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">,</span> <span class="n" style="color: #333">variables</span><span class="o" style="font-weight: bold">=</span><span class="bp" style="color: #999">None</span><span class="p">,</span> <span class="n" style="color: #333">rawhook</span><span class="o" style="font-weight: bold">=</span><span class="bp" style="color: #999">None</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="1178" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1178
</td>
<td class="diff-line-num new_line" data-linenumber="1178" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1178
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"><span id="LC1178" class="line"> <span class="s" style="color: #d14">"Retrieve MRU list data"</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/297b519ba6f6dbd9d2882952569f7e469aec6915">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/297b519ba6f6dbd9d2882952569f7e469aec6915"}}</script>
</p>
</div>
</body>
</html>