Merge remote-tracking branch 'public/pr/1709' into mbedtls-2.7

This commit is contained in:
Simon Butcher
2018-06-12 17:25:19 +01:00
25 changed files with 65 additions and 100 deletions

View File

@@ -64,7 +64,7 @@ while (my $line = <TEST_DATA>)
my $AdditionalInput2 = get_val("AdditionalInput");
my $EntropyInputPR2 = get_val("EntropyInputPR") if ($PredictionResistance == 1);
my $ReturnedBits = get_val("ReturnedBits");
if ($PredictionResistance == 1)
{
print("CTR_DRBG NIST Validation (AES-256 use df,$PredictionResistanceStr,$EntropyInputLen,$NonceLen,$PersonalizationStringLen,$AdditionalInputLen) #$Count\n");

View File

@@ -18,10 +18,10 @@ sub get_val($$)
next if($line !~ /^# $str/);
last;
}
while(my $line = <TEST_DATA>)
{
last if($line eq "\r\n");
last if($line eq "\r\n");
$val .= $line;
}
@@ -66,7 +66,7 @@ while (my $line = <TEST_DATA>)
print(":\"$val_salt\"");
print(":\"$val_sig\":0");
print("\n\n");
}
}
$cnt++;
}
close(TEST_DATA);