<table><tr><td style="">aacid accepted this revision.<br />aacid added a comment.<br />This revision is now accepted and ready to land.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D13100">View Revision</a></tr></table><br /><div><div><p>Please make me const-happy before commiting :)</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D13100#inline-89489">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pam_kwallet.c:696</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">char</span> <span style="color: #aa2211">*</span><span class="n">salt</span> <span style="color: #aa2211">=</span> <span class="n">gcry_random_bytes</span><span class="p">(</span><span class="n">KWALLET_PAM_SALTSIZE</span><span class="p">,</span> <span class="n">GCRY_STRONG_RANDOM</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">FILE</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">*</span></span><span class="n">fd</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">f</span>open</span><span class="p">(</span><span class="n">path</span><span class="p">,</span> <span class="bright"></span><span style="color: #766510"><span class="bright">"w"</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">int</span></span><span class="bright"> </span><span class="n">fd</span> <span style="color: #aa2211">=</span> <span class="n">open</span><span class="p">(</span><span class="n">path</span><span class="p">,</span> <span class="bright"></span><span class="n"><span class="bright">O_CREAT</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">|</span></span><span class="bright"> </span><span class="n"><span class="bright">O_WRONLY</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">|</span></span><span class="bright"> </span><span class="n"><span class="bright">O_TRUNC</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">|</span></span><span class="bright"> </span><span class="n"><span class="bright">O_CLOEXEC</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">0600</span></span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D13100#inline-89490">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pam_kwallet.c:704</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span class="n"><span class="bright">f</span>write</span><span class="p">(</span><span class="n">salt</span><span class="p">,</span> <span class="n">KWALLET_PAM_SALTSIZE<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">1</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n"><span class="bright">fd</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span class="n"><span class="bright">f</span>close</span><span class="p">(</span><span class="n">fd</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">ssize_t</span></span><span class="bright"> </span><span class="n"><span class="bright">wlen</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n">write</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">fd</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n">salt</span><span class="p">,</span> <span class="n">KWALLET_PAM_SALTSIZE</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">close</span><span class="p">(</span><span class="n">fd</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D13100#inline-89491">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pam_kwallet.c:755</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">FILE</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">*</span></span><span class="n">fd</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">f</span>open</span><span class="p">(</span><span class="n">path</span><span class="p">,</span> <span class="bright"></span><span style="color: #766510"><span class="bright">"r"</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">fd</span> <span style="color: #aa2211">==</span> <span class="bright"></span><span style="color: #304a96"><span class="bright">NULL</span></span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">int</span></span><span class="bright"> </span><span class="n">fd</span> <span style="color: #aa2211">=</span> <span class="n">open</span><span class="p">(</span><span class="n">path</span><span class="p">,</span> <span class="bright"></span><span class="n"><span class="bright">O_RDONLY</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">|</span></span><span class="bright"> </span><span class="n"><span class="bright">O_CLOEXEC</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">fd</span> <span style="color: #aa2211">==</span> <span class="bright"></span><span style="color: #aa2211"><span class="bright">-</span></span><span class="bright"></span><span style="color: #601200"><span class="bright">1</span></span><span class="p">)</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D13100#inline-89492">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pam_kwallet.c:764</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">char</span> <span class="n">salt</span><span class="p">[</span><span class="n">KWALLET_PAM_SALTSIZE</span><span class="p">]</span> <span style="color: #aa2211">=</span> <span class="p">{};</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">const</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">in</span>t</span> <span class="n">bytesRead</span> <span style="color: #aa2211">=</span> <span class="bright"></span><span class="n"><span class="bright">f</span>read</span><span class="p">(</span><span class="n">salt</span><span class="p">,</span> <span class="bright"></span><span style="color: #601200"><span class="bright">1</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n">KWALLET_PAM_SALTSIZE<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n"><span class="bright">fd</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span class="n"><span class="bright">f</span>close</span><span class="p">(</span><span class="n">fd</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">ssize_</span>t</span> <span class="n">bytesRead</span> <span style="color: #aa2211">=</span> <span class="n">read</span><span class="p">(<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">fd</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span class="n">salt</span><span class="p">,</span> <span class="n">KWALLET_PAM_SALTSIZE</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">close</span><span class="p">(</span><span class="n">fd</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const</p></div></div></div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D13100">https://phabricator.kde.org/D13100</a></div></div><br /><div><strong>To: </strong>dakon, aacid<br /><strong>Cc: </strong>plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>