From 2dfad048e4c811ba022a31ea6eb15a292988f54b Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Thu, 23 Mar 2017 15:49:11 +0100
Subject: [PATCH] fix windows bustage

--HG--
extra : amend_source : 416fae1b2a699b9e79707abe1b6375be2671a711
---
 gtests/der_gtest/der_quickder_unittest.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gtests/der_gtest/der_quickder_unittest.cc b/gtests/der_gtest/der_quickder_unittest.cc
index e6cf2c1f3a..6f9fa74ec4 100644
--- a/gtests/der_gtest/der_quickder_unittest.cc
+++ b/gtests/der_gtest/der_quickder_unittest.cc
@@ -15,6 +15,10 @@
 #include "secerr.h"
 #include "secitem.h"
 
+const SEC_ASN1Template mySEC_NullTemplate[] = {
+    { SEC_ASN1_NULL, 0, NULL, sizeof(SECItem) }
+};
+
 namespace nss_test {
 
 class QuickDERTest : public ::testing::Test,
@@ -67,9 +71,9 @@ TEST_P(QuickDERTest, InvalidLengths) {
   PORT_InitCheapArena(&pool, DER_DEFAULT_CHUNKSIZE);
   ScopedSECItem parsed_value(SECITEM_AllocItem(nullptr, nullptr, 0U));
   ASSERT_TRUE(parsed_value);
-  ASSERT_EQ(SECFailure, SEC_QuickDERDecodeItem(&pool.arena, parsed_value.get(),
-                                               SEC_ASN1_SUB(SEC_NullTemplate),
-                                               copy_of_input.get()));
+  ASSERT_EQ(SECFailure,
+            SEC_QuickDERDecodeItem(&pool.arena, parsed_value.get(),
+                                   mySEC_NullTemplate, copy_of_input.get()));
   ASSERT_EQ(SEC_ERROR_BAD_DER, PR_GetError());
   PORT_DestroyCheapArena(&pool);
 }