From ad50a0d7cd457d7ac36dada5bbf5718ec8ff53d4 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 11 May 2017 18:11:07 -0400 Subject: [PATCH] Fix diff_asm.go and revert another local MASM perlasm change. We're not using the MASM output, so don't bother maintaining a diff on it. Change-Id: I7321e58c8b267be91d58849927139b74cc96eddc Reviewed-on: https://boringssl-review.googlesource.com/16246 Commit-Queue: David Benjamin Commit-Queue: Steven Valdez Reviewed-by: Steven Valdez CQ-Verified: CQ bot account: commit-bot@chromium.org --- crypto/perlasm/x86masm.pl | 2 +- util/diff_asm.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl index a0a354c8f..d352f4705 100644 --- a/crypto/perlasm/x86masm.pl +++ b/crypto/perlasm/x86masm.pl @@ -89,7 +89,7 @@ TITLE $_[0].asm IF \@Version LT 800 ECHO MASM version 8.00 or later is strongly recommended. ENDIF -.486 +.686 .MODEL FLAT OPTION DOTNAME IF \@Version LT 800 diff --git a/util/diff_asm.go b/util/diff_asm.go index fa255c068..7b9b45441 100644 --- a/util/diff_asm.go +++ b/util/diff_asm.go @@ -32,7 +32,7 @@ var ( func mapName(path string) string { path = strings.Replace(path, filepath.FromSlash("/fipsmodule/"), string(filepath.Separator), 1) switch filepath.ToSlash(path) { - case "crypto/cipher/asm/chacha20_poly1305_x86_64.pl", "crypto/rand/asm/rdrand-x86_64.pl": + case "crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl", "crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl", "crypto/rand/asm/rdrand-x86_64.pl": return "" case "crypto/ec/asm/p256-x86_64-asm.pl": return filepath.FromSlash("crypto/ec/asm/ecp_nistz256-x86_64.pl")