<!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=US-ASCII" 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>
commented on a
discussion on <a href="https://gitlab.com/gnutls/gnutls/-/merge_requests/1851#note_2010170247">tests/cert-tests/data/pbmac1_256_256.extended-mac.p12</a>:
</p>
<div class="md" style="color: #28272d; word-wrap: break-word;">
<p dir="auto" style="color: #28272d; margin: 0 0 16px;" align="initial">Maybe that's because I used pbmac1-simple.p12 as the basis. For extending, I used this patch:</p>
<div class="gl-relative markdown-code-block js-markdown-code" style="margin-bottom: 0;">
<pre data-canonical-lang="diff" class="code highlight js-syntax-highlight language-diff" v-pre="true" style='display: block; font-size: 14px; color: #28272d; 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; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: .25rem; 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; vertical-align: bottom; 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/x509/pkcs12.c b/lib/x509/pkcs12.c</span></span>
<span id="LC2" class="line" lang="diff"><span class="gh" style="margin-top: 0;">index b3287dfb72..ce14a4eee6 100644</span></span>
<span id="LC3" class="line" lang="diff"><span class="gd" style="margin-top: 0;">--- a/lib/x509/pkcs12.c</span></span>
<span id="LC4" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ b/lib/x509/pkcs12.c</span></span>
<span id="LC5" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -881,7 +881,7 @@</span> static int generate_mac_pbmac1(gnutls_mac_algorithm_t mac,</span>
<span id="LC6" class="line" lang="diff"> const struct pbkdf2_params *params,</span>
<span id="LC7" class="line" lang="diff"> const gnutls_datum_t *data, asn1_node pkcs12)</span>
<span id="LC8" class="line" lang="diff"> {</span>
<span id="LC9" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- uint8_t mac_output_data[MAX_HASH_SIZE];</span></span>
<span id="LC10" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ uint8_t mac_output_data[MAX_HASH_SIZE * 2];</span></span>
<span id="LC11" class="line" lang="diff"> gnutls_datum_t mac_output;</span>
<span id="LC12" class="line" lang="diff"> int result;</span>
<span id="LC13" class="line" lang="diff"> </span>
<span id="LC14" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -892,7 +892,8 @@</span> static int generate_mac_pbmac1(gnutls_mac_algorithm_t mac,</span>
<span id="LC15" class="line" lang="diff"> }</span>
<span id="LC16" class="line" lang="diff"> </span>
<span id="LC17" class="line" lang="diff"> mac_output.data = mac_output_data;</span>
<span id="LC18" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- mac_output.size = params->key_size;</span></span>
<span id="LC19" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ memcpy(mac_output_data + params->key_size, mac_output_data, params->key_size);</span></span>
<span id="LC20" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ mac_output.size = params->key_size * 2;</span></span>
<span id="LC21" class="line" lang="diff"> </span>
<span id="LC22" class="line" lang="diff"> result = _gnutls_x509_write_value(pkcs12, "macData.mac.digest",</span>
<span id="LC23" class="line" lang="diff"> &mac_output);</span></code></pre>
<copy-code></copy-code>
</div>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
Reply to this email directly or <a href="https://gitlab.com/gnutls/gnutls/-/merge_requests/1851#note_2010170247">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/dad785208842fa09f68bcca65b241ff1/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>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Merge request","url":"https://gitlab.com/gnutls/gnutls/-/merge_requests/1851#note_2010170247"}}</script>
</p>
</div>
</body>
</html>