<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11259">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">redmine: Fix openid<br><br>For some reason, redmine:3.4 ships with ancient (2014) ruby-openid,<br>which is no longer compatible with the way how ruby handles HMAC.<br><br>Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a<br>---<br>M redmine/Dockerfile<br>A redmine/hmac.diff<br>2 files changed, 24 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/redmine/Dockerfile b/redmine/Dockerfile</span><br><span>index 25f6308..488d6f4 100644</span><br><span>--- a/redmine/Dockerfile</span><br><span>+++ b/redmine/Dockerfile</span><br><span>@@ -7,3 +7,6 @@</span><br><span>             mscgen \</span><br><span>             patch && \</span><br><span>   apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ADD    hmac.diff /tmp/hmac.diff</span><br><span style="color: hsl(120, 100%, 40%);">+RUN   cd / && patch -p0 < /tmp/hmac.diff</span><br><span>diff --git a/redmine/hmac.diff b/redmine/hmac.diff</span><br><span>new file mode 100644</span><br><span>index 0000000..197960b</span><br><span>--- /dev/null</span><br><span>+++ b/redmine/hmac.diff</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+--- usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb.old        2018-10-07 08:53:33.612724431 +0000</span><br><span>++++ usr/local/bundle/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb      2018-10-07 08:54:03.016525355 +0000</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -39,6 +39,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+     def CryptUtil.hmac_sha1(key, text)</span><br><span style="color: hsl(120, 100%, 40%);">+-      if Digest.const_defined? :HMAC</span><br><span style="color: hsl(120, 100%, 40%);">+-        Digest::HMAC.new(key,Digest::SHA1).update(text).digest</span><br><span style="color: hsl(120, 100%, 40%);">++      if defined? OpenSSL</span><br><span style="color: hsl(120, 100%, 40%);">++        OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, key, text)</span><br><span style="color: hsl(120, 100%, 40%);">+       else</span><br><span style="color: hsl(120, 100%, 40%);">+         return HMAC::SHA1.digest(key, text)</span><br><span style="color: hsl(120, 100%, 40%);">+       end</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -50,7 +50,7 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+     def CryptUtil.hmac_sha256(key, text)</span><br><span style="color: hsl(120, 100%, 40%);">+-      if Digest.const_defined? :HMAC</span><br><span style="color: hsl(120, 100%, 40%);">+-        Digest::HMAC.new(key,Digest::SHA256).update(text).digest</span><br><span style="color: hsl(120, 100%, 40%);">++      if defined? OpenSSL</span><br><span style="color: hsl(120, 100%, 40%);">++        OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, key, text)</span><br><span style="color: hsl(120, 100%, 40%);">+       else</span><br><span style="color: hsl(120, 100%, 40%);">+         return HMAC::SHA256.digest(key, text)</span><br><span style="color: hsl(120, 100%, 40%);">+       end</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11259">change 11259</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11259"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I60f6f1ede059accf6b29891abcfe3b2529744e8a </div>
<div style="display:none"> Gerrit-Change-Number: 11259 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>