phar pharcommand.inc

Marcus Boerger Mon, 02 Jun 2008 06:24:39 -0700

helly           Mon Jun  2 13:24:15 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   phar.phar 
    /php-src/ext/phar/phar      pharcommand.inc 
  Log:
  - Fix issue with -y parameter hanlding

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.4&r2=1.7.2.5&diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.4 php-src/ext/phar/phar.phar:1.7.2.5
--- php-src/ext/phar/phar.phar:1.7.2.4  Sun Jun  1 17:16:40 2008
+++ php-src/ext/phar/phar.phar  Mon Jun  2 13:24:15 2008
@@ -890,8 +890,9 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>
-6-+6++Q¶ >ç°ÍÀ-}±HÐ°E+sdDqùT{çºð^ça3©i2#¤tX#n© 
û$=ýknF#¢Û¸å¦6Ë¥ÂÈòªüN)i¼Ëê *?¾BBîÄ¦^l{%YèúüÏ>~¤ÓMÊ¨8ûePÝ®#RÃ®´¢èûj|áN¿Úo-©ºòùÛ¾J}fVoyÓQ¦a!¼Àý°×9Ërc5×¸ªPÆ.{jµ¯ÕôKDfùÙa3(ê?å·?ÃWáWílzdÄ÷Ñ×²1ùp4KbòÃÓÝ,¤÷qú%v8ÆFC-EÒl0ÊÅÏæÀó{=!ô-#¦vÕ|pÏkM!øØÙ<H1&
 S,ëËNÏ   
.i#*I>°¨u¿¥Vgcâ"ºÓiK6¢HÉ,Hòðæ<üø[v¤3¾âlS8j°iµøX¶Ð)4½¥BiÚ\\¡Û/ð
  
.$ÅenDRC_þÇWsmj¡Y Ùù+´Z¯¯A¯¯Îâÿdæ?q?´3MyÓy¬<µìÐËÃl`/£|EÓ+ÅÉ~pìAâÿ5FÝÝhý)`Ã`
 a#Å& ¼®ÁB/£d¥+    -?¯@@ -900,39 +901,37 @@
 
,lÐ×6±+Óü¤>Üp8ãyÒÌêkvmþ¸ã~ÛÚd»ºÌ²K}\äNïÐ±FbÞö^]½F²-MdÛhýÌcò¤û¨J"ùaq±t£äË²-[
        [EMAIL PROTECTED]/åÃ_(hóC/ª*Ø´Ó*ºõ)ä²·¹¨?vÃ]×ïRÆ$        6
 5j±¶0¨d«¥-ëçL
¢çö|ºì»rPýßd¨/ÕÈkÍü,Ry"ÄRÖzfu³ÑH¹õ×µJ)ml$÷xDJj*%U   
·ÕSR^ÐÕ[1½vYºÓÛÖä½éiý76G
 ÓÕ3Ì>Ð»`äÅÍ¡Õ©É  
"Éu=vû"x:Ò9É5¦v'C¦Ãù¬¡ã2Z+K3½:yh²ýÖç]&7â¡D¯´þª#ñw^-f`J-$Üe(V¸Ã¢ô:ï÷/àÔK`8t+T'D$0Ì!`Ï{MCî-¥?vÃîO¢²þ}ÉÅ{Î¦1ýäe
Ä¹ ¿ãV0ñ5z$½½âñ%÷43gúq9g|É;0øq(ÛîÒ¿®yIªÆ6%üSO-Îß
B#3Ãð¹MfbZx°BÍÕ¯ê_ÅrV)°qä,!S"¨åÏ½J¸Wóh<ÇG?Ó5$CY§9O¾8Jq³äDú-S0qW 
RõrEà7|-üUð'GÝkÁ3 
-ø¤hICÃÁÁ¿ÊÂå¬q0        
_ÙÍbÓ(!ÒÆ<(ìyÖz[÷C`6Aáø"-íYúô-îÍø¿VÚAjºL]&Òg÷Øì±5m%ì±Ý±Ò)^ûÛo%({0gè
    Ó}ÒØè,P°IòôHþEPä[opLòÁsÍÊ}ÌS±Y~nìdþ
"îí¨]Ev<àü#|VQ¶WÝ¬âyx8/Üß<D|ôöLøzgr]c¦×W}¾$(LônÀ?Ifi½   
´RýÐ- d¸¡L£Ù*±ø8Kìÿ¸7IøúúAæÂ6gUæù¶T×¾Nê¶Óf-¦Ä1¥ 
[EMAIL PROTECTED]'Éåt¯åç  ÊÿÆÑ¿|/-[{Ü÷àDmçÒóðRnKèC
-úBU~Á¸%N~eË8ÞÔfì§×Ë¤½q%õül/[EMAIL 
PROTECTED]<,Ë,3Á(D³()óÀé²!WL|¬z+ü[EMAIL 
PROTECTED];¼pöIK<êVEÈâz¬ÓÂT$ä§$.§XÛ-6&}|=æ"½°Íå´l!UÌ   
\SÇ Ã/^áFä÷úðÓDÞVøVYÜ,{Ä)Ðj'.jb÷lÎ!&)ý5Æ[9ímJêE
,--ªÍ0yãnOªM1cãn
-O¦haò<l¼Eÿ#ß¼¤ZKYùy«b¸:,~°äbíÀ²Ð÷¶ô
-?¿ uc¶ÕM·¬>_ªíuw^º-ËíwÚ:b^Ö#
-öÂg"DÚâ81Üvce"Øó8}N0UPÕ Â`¶4>0ªBvr&²ø´ÿTSø(+#Í-d`;KÃ        
M±ë®±³Xn"®cq9ÐD¸øV!,wÃÐÖÕªÕåQ^P¥     
+~ONÎDXº¶k±ÂÆ**!)¤±¬AÂÑø{ð!ùõîÉ}¯ÀeèDZ. <«jðOWUûS#*|[EMAIL 
PROTECTED]"äëHTbÛüøúåß´G.Ë®f°«¸l Ù±î      A_#hÑ Ë=º °·ØëßVZ  
uýÅµBÝSUÛóâÅý\W±OyYÓSáBûVxx[£ØÆß1¡Lù      
zªÏ¿¸ò>2±-±Ã%£F§âGG®Æ*¶O}¹«±Üô©5¾q5¦Ò{äÈÕNE9ÇÎÆBÁÕ/]I±: 
ç®ÆQr)Ð¶_»c¨Yl´½·%ÜjÞ°ghHÒU\çÔÊ
Të-Ö:"wñÕOºáªG*åtÇZÓeEÕspöÞÞ.çÔ¼Î£É¤<ùVòïvvÄåy ÷Îé:vpO·géj¦«äñ\#<É%=hä<+Äæu¡ê¼¾H0R\â£Îc;-©îX¡^ZoS/ñMÏ£©£¶hò®üÛQçËøõ
~µ.My\r<TéolÚ EjóS½_/«#³i&[EMAIL PROTECTED]<L$UøgbC4Ãr
-<'©Vêä®EXL»m¨ÓAo+ê        ê_4¾jÿÎá°J® hHÆ
-ÂQy9üâ3qÚ]gÀQúW!ë>µc2å¼áãUd|§XU±BëIKGÕ¾ìÍl{.Í¹nË®j0,[EMAIL 
PROTECTED]
-Ë ¬Ñ\ÑôPß1Òlé,+ã·0_2ÔA|ejÕ*]«(fRýÄ7Jhú:Ð|t=;<[EMAIL PROTECTED] 
øÄ¸ÞÉ¶2ÂñpÚ"K£LøT¼¤ïº-Ç¼ìîâþO<7*ìzbävÈöÐÔ'%%:-ÔÕ´ê½T¼y?c.¯YÅ³îþ=¸·ÎeÊ8¢3gÚmPPÖ6i]åÝ0ñ²,.µ×5M¹V.ö}t²s«,Zv 2Fm3~³JÅÌ¹qZ×î]òUÎI{ÁV
ÝPTµÙxqÞê7yÒ.ýASê=ê   
¬Í¢}-à-ØLX¼-ÂW9à¨Ïm[/éßv¾ÎÒÔØï>¬Ôò4¦òë/4nÓ(ÇF3¯ 8tyS!%¶n4ÚÝDÔ«S$J¨Ë)¬á6Ð((Uj*½Ò»TÉIÔÕ°¾C-ÒçobtoWL>zËÍåtÛsy+4,
   W«kõ¡,>7ÿªMõ-{ú§2¤-G¬ÅSF`*%Óåé)usNí°ê:[EMAIL 
PROTECTED];¥Üõó<ÒÏ:aú®n:ÉcOÂÜW&ó-òqH¸¸·EÏÚ°5q+í à+¥úÙ~¥rLBAÃ 
4S¤bjé4ø:{´\å®2Uz*ÁôZÓÏWYT`J®½þUu vÃA}Æ&¯lV½ëNó[åËâá5$ë.å>.ä&ßÓ%H*®¡éô_Ùp8¤iUÝVÆ.;¤k8¹M¾ä#ÁlÙÿ~¥«(UC'"Ãò4 uò½Á
    ®_"Ôîß
-|îm «`fÆÊÁí[75(¾òÞË¸Àá¤.ÆÜª© äÚ¢â»V¯i÷WiT÷Vmgõ6n\³Ð½ô"°Z°
-D¼ 
¬  H662Èå[W»ÝaóÐBW¶û(*YiÉìÞTùÜ¸¿X%ËÊMµp·]G`ÈÈ©2]®³Å°AfëSñ_gÆú'_xò¬<ã-£ÔMÂROE ,wvµËkþãÇãï£ØvñïÿãÆÆbÜ6(FF³äK²F+jHtýjé.ãiWN6UéyK§g
 dEPM¹NòRu9-Îß·ÊßL)ÕOwR¾íc^4tR-]þµ¡Il5×Q_ÍôÕó6}åSX§vÓXÐÞÊj 
yeîÏU³DòjMYR ºQÚÄl4Ñ¿sÔNe&ÙKò 
^Oé5_¨kºL2ê¥P;¥ª+ÍÁV¥¾XOâ*¸7G;g&ªGGëúM·¤íMëJÔ*}=£²¦Âôó3³y¥±ÑNÂ;[EMAIL
 PROTECTED]  ì     
M#Ãpî[Â7wJòÓÀ+ý:cjôî]ñÜ2\Á-(åÏÙ4Ìõ-ÍÄ¯ÐcÈ¬v^üÅÂÒtTxÿI«øe¡8Â£(r(¦ÙÄ"t+mZdË[ÌJlYî'[EMAIL
 PROTECTED]ßÄq¯ÃK§¹«/Ø*µ"[EMAIL PROTECTED]/[EMAIL PROTECTED]"[#o        
ZËæWB®(añòPãK·æ+Ì§7¿e18E¯7FÎvÌ|@-[Ò ª)ÓHmÝ£ßÚoCld`û[EMAIL 
PROTECTED];Ü¼(1}<,:ÝlÛÅ«ç,Äµ/ÿi^¾S¯DkchW(LlÿYºqtÎ¡âIcò©¦BôLBùx.Ý¦W
ÿC;ÅÅ·òµ _÷dPÓ»;òµZ ¡-!Ü{¹u¶}mu£U±|ë9ZÎ
Úïâhu7òAë9>B_§L5s^3NE4ö«ªÆ-Vô?è1¿Öºx£Âûâøºã:RGEµ¯|}lTÓºwu!
 ]i³-©»aYæûZ7béàÚ`×¹NÃ¨Æbææ`v(/( 
çKði/øbø§Ù_à</ÂJûíïíõÙ®zò¾×GPü°3Ó`ª0
Âl-IÑò'[â)ó=&Ô¤¾2âhHléÔF>è^È.ùj¹Lñ¶ö²t>·iûÏ4ªP¥
-:Ñk}d?!R 4d^ÙÚÚ¾ëíáá÷ ¿ú½ÏÅnªú<ÐÊû¢O0?ÂÒ³V¨`Ê«ñ/Ð¬/.Fáæpz;[EMAIL
 PROTECTED];[EMAIL PROTECTED]/4ÖÚ4ö)°qYÈì.jÿÝjj    
iËÌûÞ¼}K¸×ET<(Àc¦A] OµMzEÛ«PÃZÄ^Ø²¦ÎíE
¾¨`OqN;¢'çf6»«þ%zºmXVe69VqmÛþËúôdS×oN
-ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^)        
²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$
£;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôÝ²Ð&¸3ï9°ÓVäQ~&Ã²}o|[EMAIL 
PROTECTED] No newline at end of file
+f`J-$Üe(V¸Ã¢ô:ï÷/àÔK`8t+T'D$0Ì!`Ï{MCî+ 
éyÆQX£f«0¦¯zùÒñxH+ÑO,    
ÍAÍèuB°av0évr»Ò0Y+H:£90áí°Åæ½¦¦UÕ&C,v*´ªô»´ò0¦ÙóE¿åº   
ÊK¾Ôì(å(^Ð¬ô`9ûBÀ|õíÁ((.Â}ñýô£ý ý¢~óÍùßl4]ph®PÞÃbÃñ-G¨÷£$[´nEÇj]~%3ûjRLó,£k5jÅ5î+\®{¢£¯0èlÜr>Co¤XM¤ä¦d"Ö
 )A+?ê&XUÀ'EKòþufXë(`$¾¢óÛ1;ÄæQB¤/yPØó 
¬õ¶îÁl+éèêàß?f<9=}Éhà¦_÷CØ®?kh;'{NZn6~£I0Ñ&þUçïÏ¿ï±É¾ÿ,é?ë$ÊL;]ÈO~}²îØþ½ÀýöÉÝ+Úw¹C
>*¶Z«-\Ó(9³Âæ#PuÝ2ä¢¶$ áË4N¯y>ÃáâÐ§ú¢~p.NmcÅ=¹jÿ'[EMAIL PROTECTED]'¡
ÙÃ6iÍbÛ`    »clw¬õDWÃþã({0gè 
Ó}ÖÚè,P°I:ôHþEPä¾[o§pÌÁ»Íª½ÆS±¡~nì6þ
Áî¿¨?¶¼Ô||K¶·öÕváEx8M/Ü$ß<D|ôöLøz÷pÝ`6×Wý²$(MônÁH#ia  
´Rÿð+úBU}ÁØ%N~0ekØÂÔfì§×Ë¤½q%õül/[EMAIL 
PROTECTED]<,Ë,3Á(D³(©rÀiÖÏ%>V½§5~;Í²T¢Uoübôixnf
+ð$Î¹DX®±* åDsz¦êJDûµ$A«6QÀ]XGÔL8û$Ä%M«"dñÆOÖiajòSNDÖS¬mcu>
]ûª^fÁ>¾rØærZ5*æ®©ÎSÀÐÎ!ñ¯p³pÁCøéK"ï*|«<n=âhµG±{~Á!&)[EMAIL
 PROTECTED]<U¿ÄýÜCíKuPÅtÂ|Ø5Û3ÝÒ1s¡Q5ä]t@     
R$k¦2ûFÝOnßéÇõZÒ§Po>9h )+¤R&T+öÂgbs)JhsîÄpÌ»Ý,Á'\ytI®ú [EMAIL 
PROTECTED]@òm¥DE±Q±±;òbìêþ6eÓRPÅºW¨HehNa2V÷è\àû,2°ÌRìºkìWÛßëI\Ô×.~¡U«}\4<³rÉHõªwÍc/È« l-VQ¸5XE¥Ò4V'p2ý¢¬¸¹ÅM¹c8HðSÙuÖ*jðO×+ÖûS#*«Q¨¶9Zél5¶ÚYO©üF¤?J
 FÒ¥f½ÑUÅcöbÎv"äëHÔùÛüøúå_ÝE}XÄU`Gl Ù±ªAß hÑ ËÝå
+ °·ØëßÖZ¥ 
úkú'ëë¶«àå9û9]6còªb¬Æö!.¬ñð¶8¤³¿c)e*eFOºtúCüâÊXÊhæ"§Ð2xÒ
+ÕÊlìØ        
U¹ïéíØJt¿{èLvQ{YÉí)è¯8|¡ÅSóÆ4uô?fûdYµÖÐÓ:Ì+>"¨1rÐ®ág#(w=_%]¡ÄIóñÆ¦´<|Õ;ÚÁCUìQpÎoÄÑex
 În Çô#:K+èpÙ7gÑ:D1o
ZàÆ·Í]Ôú6F:##Û§ÀDôMp[/>%µ²`{wjÉ|ø4L~Î£6ÂhÄlhR=¨rÑNFTEÇ´Ö%oã       
CgXHáQ]Vó£ÌÆWcNÛç>ÈÌÆ«±Üôi4¾u5¦È«1¹s4k4Î\I±: 
®ÆQr%Ð¶ß¸c¨Ùl´}°%ÜzÞ²ghHÒU\gHÕÊ
Ôè+dºmCz[QOPÿ¢ñUûwUrEC2VöL¤Msà«U;ÆÔ¿
+Y§ãºc2å¼áÓU^d|«XU±BëYGGÕ¾êÍl{.Í¹iË®j0,ARëäVmlµmàr¡Ñ+ñ
ÕbØÆ'ay1 :jaýÞ~n¢3+4ßÿébïØ½Ã1È^÷+Êº&Ë¯[&^ÅU£îz±¶)7ÊÅ¾nTvnÇAÇT[Æ¨kÆoVs²¹27NÚ½O¾Ê9i/Øz¡ª6os®Õ[ó~,OÚe8jTcJ½G$µY´/¼
  
¢q|±·ªW¼È%¯$ÄQd)ãÝ*^Wñ>pßh÷$]dÒÙM«#-QÂ~zóÂâþ%m´ø"ÚEQcöÚ_RMA×äT+·ÈÃì"²·KkÂ®Eí{l«dm-}Ð[-8
       ½Z²¾º¡ð§Uø'êóCÛÖgú;_æijìwÖjyÚ
+SNùM×ewic£WP:Å¼[7íþ
+E"êÕ)C¥BÔµ*Öphª4E^Fé]*N<%êjXß¡éó·1ºw+&M½åærºk¹¼sÌëÕ¥ÁXõ¦úGýS
+Òý¤ðq £pJU½Æï¡Y½Y!v6ò0ª]{à£úZ
+»LûGÎûñ¨¼¬ â_aDt"fR¥pÕ¡MÓURÇ¸¿ßyÅI
;¾\+±º&ènGûøhØXíQ¦{²¡U,¾=y"àÒÕqØ¸VfÒßh¶$§°»m}Q0aàiè
Ke4×ôì¡lá<®ôFØL&Wj¼G×
+GsÅSF`*%Óåé)uçSã°ê:ã, 
½6I^ÑÃóeDýø)ÄÁâ÷ÝúSíúyÌég0î+¨o:ÉcOÂÜ×&óòqb·¸wÅÀÚ°5q+í 
à+¥úÙ~rLUBAÃ 4S¤bjé1uöh¹Ú-{ªôT:[EMAIL 
PROTECTED]>æ·Úå%&ÂH´Ö]Ê}\ 
É#M¾¦H*®¡éô_Ùx<¦iÕÝVÆ®:¤k8¹m¾ä#ÁlÙÿ~¥K´(UC'"Ãê4 u½Å  n^Õíß
+|îm 
«afÆÊÁÝ[75(¾òÞõaLt8©ñÚ,·§jjy¦¶¬ù®õmºýÕv5½ÕcÛY½×Â,tã+½f®¬%¯+)(
ruàÖÇîvØ<´ÐÕ¦Ý>ÊgÖZrÇ&»· 
U>_%´Gn&Ëªmµpw]G`ÈÈ©2].³³Å°EfëSñ_oÆú'_xò"¬:ã-£ÔMÂROE ,7ÂuËkþãÇÓï¢ØöñïÿãÆÆbÜ5)VF³äK²F+jHtýjé.ãéVN6UéyK§Mg
 dEPM¹NòRõ9+În¿Jêî¥|ÛÇ¼h([EMAIL 
PROTECTED]&ª=Hag²+zýéy¤$Ñ%§ª¡ÏÕ
MÅhËôÖãÛû°]³'ÇÑÇd:×¸¯¥îÂÂgGØ?éf/CYïn
»H3¾.½kïýJzúisï¢M{B¢UpúîU*UjÅe¿Æ;ÞikíNo(ÕÐþ-8dõuzé¸+·×ÌYk_þÝ¼<}?§_6ÆÐ®PØþ³tãè1BÅÆä
RM/¯3«(èòñZ\ºM=®þvïäkA¿þÉ .¦w9[÷äkuB9[B¸÷rêlûÆ6ê.G«fùÖs´´£ÕßtÈwçøY|2ÕÌyÍ8ÑØ¯.¨dØÂ/ªËUùÐÆ¿ÕmòÝ8ÑáºXå x;ois¶zÆ{ë:|ý¨©á;ßfÑÏ©µùÅrRêî¾ULÒ<ã»|Õl}zêá×sI §×%ÇÖ÷J|n°^Z¬¶í÷Ùy'@eü»:¢è]ú,.\_G/$'^6wå=¢gpáÅåýj7S<gFÒU2:QÐ?íº¬qSOCÝÂ
+ÕPwH2Ôß6¥Ã2È+éiãUNæÍ¯fnØÚÙ`å?²ÿ_qáïeÁ×^è;û%hÏZ÷eÝ'y¡Ú¬õ&ÌRiTµQkd®±[ëéÑú9ßÜVIa¿³´("yÛ2¦
Är+aûî$®UPõ¢óM³nµÞFÕ¦a¿»ÞE+Wx 
âëwèHÕ¾þñõ±QMëÞÕuv¥QÎz´øñ·ÝÁlkÞm8- 
cHß=+ç¯t1HóWù³ÁùëÒù+ñB¯]ðý/ÁÁ!¾?ê_à's1Õy¤>[Ði%ææ[-Çëä#6Ö;Q¡ÊùÌmå¬mI0
ø§v±¯Ã¤yÆÖõtÞÔ¤ÝÒì½Á_ð±T{+ÝÐ_×÷Ön:Öv^]ÖJ²½®ì©Ú±\Og}·ã¥öá^)      
 ²ÛÐ'F_±jUtÇBN~£s>0]\ªHXÄ$
£;}«CÿÂhtçx>´M¤A£Ós"¤:Ë-Æ2ÞékL¶ò9ÆôÝ²Ð&¸3ï9°ÓVäQ~&Ã²}o|[EMAIL 
PROTECTED],£d\&x:iËíÝ6è_\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.4&r2=1.49.2.5&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.4 
php-src/ext/phar/phar/pharcommand.inc:1.49.2.5
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.4      Sun Jun  1 17:16:04 2008
+++ php-src/ext/phar/phar/pharcommand.inc       Mon Jun  2 13:24:15 2008
@@ -137,7 +137,7 @@
                 'inf' => '<regex>  Regular expression for input files to 
exclude.'
             ),
             'y' => array(
-               'typ' => 'string',
+               'typ' => 'privke',
                'val' => NULL,
                'inf' => 'Private key for OpenSSL signing.',
             ),
@@ -154,9 +154,6 @@
         }
 
         $hash_avail = Phar::getSupportedSignatures();
-        if (!in_array('OpenSSL', $hash_avail)) {
-               unset($phar_args['y']);
-        }
         $hash_optional = array('SHA-256' => 'SHA256',
                                'SHA-512' => 'SHA512',
                                'OpenSSL' => 'OpenSSL');
@@ -354,6 +351,27 @@
         return $arg;
     }
     // }}}
+    // {{{ static function cli_arg_typ_privkey
+    /**
+     * Argument type private key (for OpenSSL signing)
+     *
+     * @param  string $arg  The phar selection
+     * @param  string $cfg  The config option.
+     * @param  string $key  The key information.
+     * @return string $arg  The selected algorithm
+     */
+    static function cli_arg_typ_privkey($arg, $cfg, $key)
+    {
+        $arg = self::cli_arg_typ_string($arg, $cfg, $key);
+        
+        $hash_avail = Phar::getSupportedSignatures();
+        if ($arg && !in_array('OpenSSL', $hash_avail))
+        {
+               self::error("Cannot specifiy private key without OpenSSL 
support.\n");
+        }
+        return $arg;
+    }
+    // }}}
     // {{{ static function phar_check_hash
     /**
      * Check whether hash method is valid.
@@ -1516,7 +1534,7 @@
        $use_ext = extension_loaded('phar');
        $version = array(
                'PHP Version' => phpversion(),
-               'phar.phar version' => '$Revision: 1.49.2.4 $',
+               'phar.phar version' => '$Revision: 1.49.2.5 $',
                'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not 
available',
                        'Phar API version' => Phar::apiVersion(),
                        'Phar-based phar archives' => true,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar /ext/phar/phar pharcommand.inc

Reply via email to