Merge branch 'mbedtls-1.3' into development

* commit '23c0608':
  Fix bug in generate_code.pl
  Fix typo in contributor name (oops!)
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-17 20:39:50 +02:00
commit e2650c8238
2 changed files with 2 additions and 2 deletions

View file

@ -73,7 +73,7 @@ Security
Features Features
* Add support for reading DH parameters with privateValueLength included * Add support for reading DH parameters with privateValueLength included
(contributed by Daniel Khan Gillmor). (contributed by Daniel Kahn Gillmor).
* Add support for bit strings in X.509 names (request by Fredrik Axelsson). * Add support for bit strings in X.509 names (request by Fredrik Axelsson).
* Add support for id-at-uniqueIdentifier in X.509 names. * Add support for id-at-uniqueIdentifier in X.509 names.
* Add support for overriding snprintf() (except on Windows) and exit() in * Add support for overriding snprintf() (except on Windows) and exit() in

View file

@ -139,7 +139,7 @@ while($test_cases =~ /\/\* BEGIN_CASE *([\w:]*) \*\/\n(.*?)\n\/\* END_CASE \*\//
$param_defs .= " char *param$i = params[$i];\n"; $param_defs .= " char *param$i = params[$i];\n";
$param_checks .= " if( verify_string( &param$i ) != 0 ) return( 2 );\n"; $param_checks .= " if( verify_string( &param$i ) != 0 ) return( 2 );\n";
push @dispatch_params, "param$i"; push @dispatch_params, "param$i";
$mapping_regex .= ":[^:]+"; $mapping_regex .= ":[^:\n]+";
} }
else else
{ {