head	1.2;
access;
symbols
	pkgsrc-2020Q2:1.1.0.10
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.6
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.8
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.4
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.2
	pkgsrc-2019Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2020.06.30.14.33.15;	author thorpej;	state dead;
branches;
next	1.1;
commitid	89Gng6GQX5qVZfeC;

1.1
date	2019.05.14.04.08.51;	author thorpej;	state Exp;
branches;
next	;
commitid	hSFvY4P8GKTZO7nB;


desc
@@


1.2
log
@- Re-factor the arm-trusted-firmware packages into common definitions and
  build infrastructure.
- Update arm-trusted-firmware to v2.3.
@
text
@$NetBSD: patch-fiptool_uuid_parse,v 1.1 2019/05/14 04:08:51 thorpej Exp $

Patch from upstream to fix UUID parsing bug in --blob handling.

--- fiptool.c.orig	2019-05-14 04:51:36.000000000 +0000
+++ fiptool.c
@@@@ -271,10 +271,10 @@@@ static void uuid_from_str(uuid_t *u, con
 	    &u->node[2], &u->node[3],
 	    &u->node[4], &u->node[5]);
 	/*
-	 * Given the format specifier above, we expect 11 items to be scanned
+	 * Given the format specifier above, we expect 16 items to be scanned
 	 * for a properly formatted UUID.
 	 */
-	if (n != 11)
+	if (n != 16)
 		log_errx("Invalid UUID: %s", s);
 }
 
@


1.1
log
@Pluck the following patch from upstream:

tools/fiptool: Fix UUID parsing in blob handling
Commit 0336486 ("Make TF UUID RFC 4122 compliant") changed the scanf
parsing string to handle endianness correctly.
However that changed the number of items sscanf handles, without
adjusting the sanity check just below.

Increase the expected return value from 11 to 16 to let fiptool handle
UUIDs given as blob parameters correctly again.

Signed-off-by: Andre Przywara <andre.przywara@@arm.com>
@
text
@d1 1
a1 1
$NetBSD$
@