GH355: Implement HKDF

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 68a9a6c042df5b9be7ee73d2e6172b162f13d938..1e5f84e04965fc137df3b8ef75415008ecc0138b 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -34,8 +34,6 @@ my @dirs = (
 "crypto/dso",
 "crypto/dh",
 "crypto/ec",
-"crypto/ecdh",
-"crypto/ecdsa",
 "crypto/buffer",
 "crypto/bio",
 "crypto/stack",
@@ -50,7 +48,6 @@ my @dirs = (
 "crypto/x509v3",
 "crypto/cms",
 "crypto/conf",
-"crypto/jpake",
 "crypto/txt_db",
 "crypto/pkcs7",
 "crypto/pkcs12",
@@ -59,15 +56,17 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 #"crypto/store",
-"crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
 "crypto/ct",
+"crypto/async",
+"crypto/chacha",
+"crypto/poly1305",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",
-"engines/ccgost",
 "test",
 "tools"
 );
@@ -95,7 +94,7 @@ my $s="";
 
 while (<IN>)
        {
-       chop;
+       s|\R$||;
        s/#.*//;
        if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
@@ -105,10 +104,10 @@ while (<IN>)
                        {
                        if ($b =~ /\\$/)
                                {
-                               chop($b);
+                               $b=$`;
                                $o.=$b." ";
-                               $b=<IN>;
-                               chop($b);
+                               $b = "" unless defined($b = <IN>);
+                               $b =~ s{\R$}{};
                                }
                        else
                                {