<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p style="color: #777777;">
<a href="https://gitlab.com/dueno">Daiki Ueno</a>
<a href="https://gitlab.com/gnutls/gnutls/-/issues/1729#note_2684492595">commented</a>:
</p>
<div class="md" style="position: relative; z-index: 1; color: #3a383f; word-wrap: break-word;">
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">Thank you for spotting this, <a href="https://gitlab.com/twilfredo" data-reference-type="user" data-user="29082969" data-container="body" data-placement="top" class="gfm gfm-project_member js-user-link" title="Wilfred Mallawa" style="color: #284779; background-color: #cbe2f9; border-radius: .25rem; margin-top: 0; padding: 0 2px;">@twilfredo</a>. I would change <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>server_recv_params</code> to treat <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>pskcred->binder_algo == NULL</code> for auto-detection, rather than introducing a new MAC entry for UNKNOWN. Something like the following might work, though we probably need a unit test for that:</p>
<div class="gl-relative markdown-code-block js-markdown-code">
<pre data-canonical-lang="diff" class="code highlight js-syntax-highlight language-diff" v-pre="true" style='display: block; font-size: 14px; color: #3a383f; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 1rem; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; border-radius: .25rem; background-color: inherit; white-space: pre; margin-top: 0; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="diff" style="margin-top: 0;"><span class="gh" style="margin-top: 0;">diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c</span></span>
<span id="LC2" class="line" lang="diff"><span class="gh" style="margin-top: 0;">index d709efa74b..0f40d81de8 100644</span></span>
<span id="LC3" class="line" lang="diff"><span class="gd" style="margin-top: 0;">--- a/lib/ext/pre_shared_key.c</span></span>
<span id="LC4" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ b/lib/ext/pre_shared_key.c</span></span>
<span id="LC5" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -886,9 +886,9 @@</span> retry_binder:</span>
<span id="LC6" class="line" lang="diff"> gnutls_psk_key_flags flags;</span>
<span id="LC7" class="line" lang="diff"> uint8_t ipsk[MAX_HASH_SIZE];</span>
<span id="LC8" class="line" lang="diff"> </span>
<span id="LC9" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- prf = pskcred->binder_algo;</span></span>
<span id="LC10" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- if (prf->id == GNUTLS_MAC_UNKNOWN)</span></span>
<span id="LC11" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- prf = _gnutls_mac_to_entry(mac);</span></span>
<span id="LC12" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ prf = pskcred->binder_algo == NULL ?</span></span>
<span id="LC13" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ _gnutls_mac_to_entry(mac) :</span></span>
<span id="LC14" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ pskcred->binder_algo;</span></span>
<span id="LC15" class="line" lang="diff"> </span>
<span id="LC16" class="line" lang="diff"> /* this fails only on configuration errors; as such we always</span>
<span id="LC17" class="line" lang="diff"> * return its error code in that case */</span>
<span id="LC18" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -983,7 +983,7 @@</span> retry_binder:</span>
<span id="LC19" class="line" lang="diff"> * even for SHA384 PSKs, so we need to retry with SHA256</span>
<span id="LC20" class="line" lang="diff"> * to calculate the correct binder value for those.</span>
<span id="LC21" class="line" lang="diff"> */</span>
<span id="LC22" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- if (prf->id == GNUTLS_MAC_UNKNOWN && mac == GNUTLS_MAC_SHA384) {</span></span>
<span id="LC23" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ if (pskcred->binder_algo == NULL && mac == GNUTLS_MAC_SHA384) {</span></span>
<span id="LC24" class="line" lang="diff"> mac = GNUTLS_MAC_SHA256;</span>
<span id="LC25" class="line" lang="diff"> goto retry_binder;</span>
<span id="LC26" class="line" lang="diff"> }</span></code></pre>
<copy-code></copy-code><insert-code-snippet></insert-code-snippet>
</div>
<p dir="auto" style="color: #3a383f; margin: 0;" align="initial">cc <a href="https://gitlab.com/hare1712" data-reference-type="user" data-user="2722535" data-container="body" data-placement="top" class="gfm gfm-project_member js-user-link" title="Hannes Reinecke" style="color: #284779; background-color: #cbe2f9; border-radius: .25rem; margin-top: 0; padding: 0 2px;">@hare1712</a></p>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #626168;">
—
<br>
Reply to this email directly or <a href="https://gitlab.com/gnutls/gnutls/-/issues/1729#note_2684492595">view it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.com">gitlab.com</a>. <a href="https://gitlab.com/-/sent_notifications/2eb9dfa1c2228e8b3735b6d7ab700c35/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.com/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.com/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<span style="color: transparent; font-size: 0; display: none; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0;">
Notification message regarding https://gitlab.com/gnutls/gnutls/-/issues/1729#note_2684492595 at 1755047169
</span>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Issue","url":"https://gitlab.com/gnutls/gnutls/-/issues/1729#note_2684492595"}}</script>
</p>
</div>
</body>
</html>