summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2008-06-01 07:39:06 +0000
committerMarcus Boerger <helly@php.net>2008-06-01 07:39:06 +0000
commitc05c40cea4d7adb8043c7e3e8eb6bb0afcdd123e (patch)
tree905ee34e392381a7e04c92f118115358b6a9e2be
parent5fbeb235d2bf7b8a7810a5ac10ab2c07d1110788 (diff)
downloadphp-git-c05c40cea4d7adb8043c7e3e8eb6bb0afcdd123e.tar.gz
- Add Openssl support
-rwxr-xr-xext/phar/phar.phar92
-rwxr-xr-xext/phar/phar/pharcommand.inc14
2 files changed, 47 insertions, 59 deletions
diff --git a/ext/phar/phar.phar b/ext/phar/phar.phar
index 3658aff667..9de6b54b14 100755
--- a/ext/phar/phar.phar
+++ b/ext/phar/phar.phar
@@ -890,26 +890,16 @@ spl_autoload_register('command_autoload');
new PharCommand($argc, $argv);
__HALT_COMPILER(); ?>
-6
-
-$mA Eꖤ>]{Ɲ
-#"'Hc_b;e,c6阄;~%Gxyz";'B"8ik,jXzQ'үivVLxl=B'5 lvHPI.sGp-2&hoL1 5=8 z(㟝p+P#ω7\
-@Bz\#P5ҕ! @V&nZ .b.2l,1~"#{ZP^ Yt5_N/o( .HD R(D DXsG]W^OQLi
-T-Wfksq~֊O3
-t-ie˂89XLm/MaҢYKpcMZƁQ<(c L/Q.t?#A.bB/ [2GZOwnZ[A霐a1AY:z1WKnF#۸զ6hŸN-)I9a]~|>fX?# ENl\F C\@uXdHЊk;zIvDo:YMG+`+3Z,=j6q]mj_*WfP*o_K=?0Uc |QB9ӯ 6l zQE(6Y
-bL.@חN h#*N>,u
-09S"YK6H,r=[v*[3zH8jiX) 4 ris1n\Q !Xr$݈8
-C_Ǘ65,QZE @נWB2؟Cu'Ob:0k' x _Bq{x?fQwdZe
-И`È,KT#~kaG{i@I4sz?9c$N'ٗyAn) R薲icpbɤH*^5+
- ^ie5
-HRZx˿8?
-
-ͱECbJ_\iiŏx?d
-! ~NoTf#G[L.#.D.#k "8bTS>m*j*Lu* ({ҭ?^4>R3aJb<-N|! |m]lD|>\d&" -5UiPĐﯽT$%%?&ԯr, ~ g聀cw gH] zЊA>c{@,rzyȄ}1Kd8@[8Q]Vk`1D
-x<eK\A+fhnuFAn6π1Sv3A5ND/[{ZW ;_h&]ؒFR6#W@T#(G aU|1ٓ5)V&ne}"fnFfgu pQ)t(R0X 8aplnSee.'ZȄL6y۪
- fej<[ &B١ȧΖY'>+գm i+Ri+Ћh`pqx,u1ɟrx<DGj]qϸr{2W[GTUW8:Hʽ|( |LaRJV7)ײ4V]IZN#<m21_xAK;1AMu
-yZVMjzm Jnhg߶)L6-0Cπ7w<43C
-D CέMXqDt{@&ha ]'mӼme7*Õ9ڳB:9v ժ!-ШOf??.N
+6
+
+>͏-}HаE+sdDqT{^a3i2#tX#n $=knF# ۸6ŸN)i*?BBĦ^l{%Yϟ>~ӉMʨ8ePݮ#Rîj|No-۾J}fVoyQa!9rc5׸P.{jKDfa3(??WWlzdײ1p4Kbӄݓ,q%v8FC-El0{=!-#v|pkM!<H1& S,˂N .i#*I>uVgc"iK6H,H<[v3lS8jiXД) 4Biڗ\\/ .$e nDRC_WsmjY+ZAΕd?q?3Myy<l`/|E+~pA5Fݑh)``
+a#&
+ B/d+ -?
+V+`Y1ꌤ é7
+}S&$^G~%j+Og
+,l6+>p8y̙kvm~d̲K}\NбFbޘ^]F-MdhcJ"aqt˲-[ lݎ8m }@4N/_(hC/*ش*)?v]R$ 6
+5j0d-L|rPߗd/k,Ry"RzfuѝH׵ J)ml$xDJj*%U SR^[1vYֆi76G
+ӟ3>л`͝՘ "u=v"x:95v'C2Z+K3:yh]&7D#w^
f`J-$e(V:/ԔK`8t+T'D$0!`ς{MC
W<{`V9{lEIXpͶ!`VBٹ~79>*x2*7[Q?{7r icbgK})'''ً]FqFr>a,] qi̱[4)xL`ǫBgU2."5TQzh'E`(~.=$W`X tf8;yO
YL\?*KX^dg_,{??J?D3d =#L=b0  r"@1`k/43gq9g|ə;0q(пyIV~ƩBo`&31-<X!W/b98Jr)^%My4_Ӝ'C_O^r?}
@@ -919,36 +909,32 @@ W<{`V9{lEIXpͶ!`VBٹ~79>*x2*7[Q?{7r icb
:r@aA/ CT8IaIZ0eK
|MA`F"b1P9>zqpd.pdt!!Q(yA7h*7VŸuπ*%y
H 2 KQH& |yfCvMH_AXC`6A<
-nS"٧#69`MQw 4܆Zc'0͐zagE %CP '2@D$؜ʜLdym_
-)5N~^E8Ox0%uuafA*Ll <{FTV|ί)
- T֋"-Op@Akl*U69 X@G(bיEtt\?\1I0ѻҺh3<
-aYf F!EI'fL {ǪB 4p_>5>%<",BʒX%r9=S5ZUO(`H> qGݪASOuZ#)61* |U 3`_HoF9-BHs@!Æ
-*e8ZmyM9$x'Ǡܛ^T-ls(X(L=C{ejXۀf;閎 !J"X3m^KM' $E`Ey3nZǝ)MGL(xXUK׎@WVpFoBv1mL
-(hoz4B#Zu!לz.:!I@F4`X,l^3*
-d`KÓH뎑*3A ʹ_h2
-V+6w^Oxd?YUn5VQJB]A8?G`_al/sKYR\#jڟѦjE;J`vH]cS)EY3d/l;BDqϯ_@yNY1H\eVX(*D
-A>YYJ`~Wh/mU-yyq~F'0]#[;n
-R^.
-\98wXJ%'Gt&V:i΢s::)4"J):))'- a6(>`{!+ɝqEm,I
-j8QcXuۇ"
-h%΢GG*O}1U:Gt8v6:xjL9w5 :dm٘xZ\<)})<d5rL U*=خʩ`.]6br0 o I2k?(qќeC̝
-~%X9]66@shl7 &5SOVW-`C*gJJ{1qW{5FiqQ+xY-DU} dVr.+b ^vot,R&CXٴS\
-w7aTE:ÀڌԿ
-Y;c2e*A2~TEj_fF\WA5 ur6Z&NPh
-x8Q&|*^@]c vv0 fڥy{]4 4
-_W9m?JV`
-SNUicWP:żI vw"R!p5JMQQ6aWY1!T+JmC9ݴ>[
-K꺮`( ͿjS}u .ARؓQ8m(}YѼYs60 ]{Z
-LY#O>v<*/+WP#6?nj*)c̔ﵞ9!r^q^q"['ZWb*A ѥe] cƞ
-MO̫ hoGYI|ԯ2lhZobt6t7 [H6>(04Gt>Hi4l<.FX-xm[+qcLbsU-CjET _ҋ'E<[DO!/O2y0^q굚t'L qHEKؚ2H$xLlR%*Ja) RtvH=ZrW*۔`,*p㬽UuvA}&TUoםʗ9nWאhYy\ }M~KT\C鿲pHӪ.]vHpr| Gٲ#JWІ
-& ˃t'~J+p򹷁D+7wlԠ=?m^D'u1^<TMM ߵz=BLzl;7q ԂU$>E[Uu6;lZJvE:VZrG[,*ʑfæȮN B0dLTDŰAfSa^g*%_xNvVQ&anO3;ue5 (v"A_樮7g+
-,RĊJ]eZm՟MU.vhu6/UyO6:&i/\oYk+ȔPt+E>ECAU`3my2/̏Y_`ī09Rne`|cC~($5T+94*E://@=|یo2hYBeK1NT5nRGϖyA-wvx꾪a}44NMFKN;QN.z~\]7:E4M^+Y}󢲥CKfZS Mbj֠+‚8€vUVɻ,3?W%W _э&fkli0IM𓒢${I>)O uÕIF*SlX!;9ygztKJo X M 73)kZ!~~j3t5ruGڣk"5W)
-q7+ͦ1@`o ~{CvdU/sEY8"bMs*EեĖe]UY]]Wksģ_Ir0:z/n3r-Z-]-얋o=CuljN^(z`ԊYJ㉪,\yRk+xA `"_u[YD
-z&|nSZЯLӻ[Z -!UÇ:ݺѪX-ֿn:ġ5!S9̦'@-llX99m&-ުP׹Vgg׍ ݜZ_,'
-y[ 哨f$SK=._+ XQznUڶg
- 
-t/:x?*4ʏ͡$`oנ>Ë0'
-I\-0jR_Oq4
-$tCt/d|\xizY۴{UR8 ) 2ܹu./Z+A.{T4!yy`~<gP7" QY_
-\>/*IyF#]lo~&&|g j:]AO@쯘6T/4ڋ4) qY.j݁jj i˅޼}KET<(c A] OMzEۜPZ^ز E `OqN;'f6%zmXVe69Vq mdSo N
-_מn:v^]ֆJ \Og}^) Ћ'F_jUtBN~s>0]\HX$ ;}Chtx>MAs":-2kL9ݲ&39VQ~&ò}o|؎!7@?پ
+nS"٧#69`MQw 4܆Zc'0͐zagE %CP '2@D$؜#
+tp>w27L&^^KGJ= Wo[qtK\;Qr&f&jz\yeI@i^'šOE\J”=2ÁYVaBޣ>}2Uր.S#ׂPUfe1;Vz"a=MSI>jlt($z$"O23EI+ov6D1ύ|ޯ.aC8X;CIn.w.O%54>g2 #y e[L:?0_+O&z`@0TAfkʚ;!hй<P3%qix6|yS@Yo1)dd*I6޵xqD/r5(!'b gMx5@
+뵤O$|r@R4
+z[ | MAܶdJc+w/CGcU?j #ؑP@} ~wϙrOړ[ngVZPA*z=Gڸ\qfG{mF߽bk C!TC|aO
+aĤ~Ѹޣڴ < [iZ;&-~j
+uoР=,B6[V LJ)rd_1禇UG 3ߢqy/Pn˙`xivU Ξxy|v6 vT^pc܂LJ^<CPcnL|O;5ג7#sq'mEdR7iky2qYZճnZ6;"n+):Ԛ9,yW:w”1<}TiLٗlqG+#(o=[%mě29G{3˲юmϜsv|%h98wXIK%'Gt&V:j΢s::l)4"J):))'- a6(>`{!+ɝqEmрФzPS52jCgXRQgQ#WcMۍ>́՘#Wc:h; Ukt5&]逜GɅ@j|ncѶlL<-u._QX|N9&*bfzlW`F0eZJ[ir0 o I2k?(qќeC̝
+~%X9]66@shl7 &5SOVW-`C*gJJ{1qWT5FiqQ+xFY/DU~ dVr.+b ^votR&dEXٴS\
+ՙb1"Iu.J3aCq
+k&Vxnt>=AWen
+Q/o!>VtNwr dUdXUBQKGվl+.nj0,ARVmlMr
+YjcL-7a1QZX76sFNV#W 1(;Qkq,y"6 yAu0, /SQvehk0ht[/c jO~2:|t=;<wv@K Ϲq} me)DFxIuRy/LO<7jzbmvvg$:
+6BaArG0<C?y~ѽAh$` pmwjn Z
+oveXgT5d#. ʞ-ZӦ^ڲծNi|j8zT^p}m p왚2S>-0"^2g% @*
+^FZ_q
+F1O\WJ@͆-$nEALx#b4kGPpz#ojۭ8Y1 1*T!"/a-"J'wwD<z8ZM:CW&8$Y ֢g%lMDJ$<Srv~W)ZP0͔XZ`C: ;-WImJ0}M,*p㬽UuvA}&/nUoםʗ9nWאhYy\ }M~KT\C鿲pHӪ.]vHpr| Gٲ#JWІ
+& ˃t'~J+p򹷁D+7wlԠ=?m^D'u1^oTMM ߵz=BLzl;7q ՂU$5AE[Uu6;lZJvE:VZrG[,*ʑfæȮN B0dLTDŰAfSa^g*%_xwVQ&anO3֛{e5 (v"A_樮7g+
+,RĊJ]eZm՟MU.vhu6/UyO6:&i/\oYk+ȔPt+E>ECAU`3my2/̏Y_` 09Rne`|cC~($5T+9F6E://@=|یo2hYBeK1NT5nRGϖyA-wvx꾪a}44NMFKN;QN.z~\]7:E4M^+Y}󢲥CKfZS Mbj֠+‚8€vUVɻ,3?W%W _э&fkli0IM𓒢${I>)O uÕIF*SlX!;9ygztKJo X M 73)kZ!~~j3t5ruGڣk"5W)
+(mhi $%+_ސ!Y"/vk+ȡfEn-ou)ekWmrVWm(}$'a:W
+?K7"T<K 2񖚒I(jhF;.g|VB(gAwrNlr*o=G˹/qq(pMG딩f;žj a 6VNkN@FwDn`5Buhu|5C7IByޖykt$> ï@OK"J|nV[y'@eYQ.}.y
+S+:,=,nP)3vA%S
+7u4 E ut(Cc]:, AG"A׶QӤLMmԺPq/ tA#a5#~R7@<DRk42!f
+ǠKd^j͹ X#{V|텾_u_V}Zou,!CU62vkL^${y$/UƔaX6NZN/Z_X7&YGMT@.]XMl9a[]&S=
+Tzl&+}│+X4TZ
+gtƍ\Fy;J3#o/ּlpC4Ɛ-W_馎g ׅWcv! }d.: :>\E#A|&z0ʟLGc'
+<[ gR4v
+ɏn-rQ0mn/7*f|7x +-x[g;C^A,NGt,0@:`Y7GSwEl=GkJ5Vny9&gDF^ʋeejZuR\5P4/xN5%UOZKHV4!#/a rd-mVE{ lnh\,w\m6}pCfAϋ(K*EL$Q
+" #$#Ղ # ۔&?Od*ҝ-EwmjUR5P \M"¯`&p϶݋(ϻJ'cs(,؛5"b Q޼@> џK|UmmR&!NxݷhBRcK< bWS- %_-)^^V6mF@TA'zB
++wlv{Pǟ އa7M}h}'Y+TF0午Bh֗p 8Jg uBHW7[ḟsƾt9`|W~x|xAO@쯘6T/4ڋ4) qY.j݁jj i˅޼}KET<(c A] OMzEۜPZ^ز E `OqN;'f6%zmXVe69Vq mdSo N
+_מn:v^]ֆJ \Og}^) Ћ'F_jUtBN~s>0]\HX$ ;}Chtx>MAs":-2kL9ݲ&39VQ~&ò}o|؎!7@?d
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index 43753e9bf9..2ed92b961f 100755
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
@@ -150,12 +150,14 @@ class PharCommand extends CLICommand
}
$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';
+ $hash_optional = array('SHA-256' => 'SHA256',
+ 'SHA-512' => 'SHA512',
+ 'OpenSSL' => 'OpenSSL');
+ foreach($hash_optional as $key => $name)
+ {
+ if (in_array($key, $hash_avail)) {
+ $phar_args['h']['select'][strtolower($name)] = $name;
+ }
}
$args = array();