From: Marcus Boerger Date: Mon, 14 May 2007 18:26:01 +0000 (+0000) Subject: - Only show available hash algorithms X-Git-Tag: RELEASE_1_2_0~55 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e22fcf8de948f9c96744e80fcd58b44d01a54723;p=php - Only show available hash algorithms --- diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index 0eb6398f6e..1304cc6e2e 100755 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc @@ -33,12 +33,22 @@ class PharCommand extends CLICommand 'c' => array('typ'=>'select', 'val'=>NULL, 'inf'=>' Compression algorithmus.', 'select'=>array('gz'=>'GZip compression','gzip'=>'GZip compression','bzip2'=>'BZip2 compression','bz'=>'BZip2 compression','bz2'=>'BZip2 compression','0'=>'No compression','none'=>'No compression')), 'e' => array('typ'=>'entry', 'val'=>NULL, 'inf'=>' Name of entry to work on (must include PHAR internal directory name if any).'), 'f' => array('typ'=>$phartyp, 'val'=>NULL, 'inf'=>' Specifies the phar file to work on.'), - 'h' => array('typ'=>'select', 'val'=>NULL, 'inf'=>' Selects the hash algorithmn.', 'select'=>array('md5'=>'MD5','sha1'=>'SHA1','sha256'=>'SHA256','sha512'=>'SHA512')), + 'h' => array('typ'=>'select', 'val'=>NULL, 'inf'=>' Selects the hash algorithmn.', 'select'=>array('md5'=>'MD5','sha1'=>'SHA1')), 'i' => array('typ'=>'regex', 'val'=>NULL, 'inf'=>' Specifies a regular expression for input files.'), 'm' => array('typ'=>'any', 'val'=>NULL, 'inf'=>' Meta data to store with entry or read from.'), 's' => array('typ'=>'file', 'val'=>NULL, 'inf'=>' Select the stub file.'), 'x' => array('typ'=>'regex', 'val'=>NULL, 'inf'=>' Regular expression for input files to exclude.'), ); + $hash_avail = Phar::getSupportedSignatures(); + if (in_array('SHA-256', $hash_avail)) + { + $phar_args['h']['select']['sha256'] = 'SHA256'; + } + if (in_array('SHA-512', Phar::getSupportedSignatures())) + { + $phar_args['h']['select']['sha512'] = 'SHA512'; + } + $args = array(); foreach($phar_args as $lkey => $cfg) {