Commit 31676a35 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent 6b9e941e

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ 


 Changes between 0.9.8a and 0.9.8b  [XX xxx XXXX]



  *) Link in manifests for VC++ if needed.

     [Austin Ziegler <halostatue@gmail.com>]



  *) Update support for ECC-based TLS ciphersuites according to

     draft-ietf-tls-ecc-12.txt with proposed changes.

     [Douglas Stebila]

util/pl/VC-32.pl

+4 −2
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ sub do_lib_rule 
			}

		$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;

		$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";

        $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;2\n\n";

		}

	$ret.="\n";

	return($ret);
@@ -298,8 +299,9 @@ sub do_link_rule 
	$file =~ s/\//$o/g if $o ne '/';

	$n=&bname($targer);

	$ret.="$target: $files $dep_libs\n";

	$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";

	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n\n";

	$ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";

	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";

    $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;1\n\n";

	return($ret);

	}