提交: 6e7ce26cea0e8d5bdbbebc3752bf9f0551948187 - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修訂: 6e7ce26cea0e8d5bdbbebc3752bf9f0551948187 (tree)
• 時間: 2010-03-18 23:09:04
• 作者: h677 <h677>
• Commiter: h677

Log Message

生キー指定で、16桁未満とSaltが16進数以外で???にするように修正

Change Summary

• modified: Trip.pas

差異

--- a/Trip.pas
+++ b/Trip.pas
@@ -424,12 +424,12 @@ procedure get_pw_salt(
     const pw : PChar;
     var convpw : String;
     const salt : PChar
-);
+) ;
 var
     i : integer;
 begin
     // ^([0-9A-Fa-f]{16})([./0-9A-Za-z]{0,2})$
-    if (Length(pw) >= 17) or (Length(pw) <= 19) then begin
+    if (Length(pw) >= 17) and (Length(pw) <= 19) then begin
         // ƒL[•”•ª
         for  i := 0 to 7 do begin
             if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and
@@ -501,6 +501,9 @@ begin
             if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
                 // «—ˆ‚ÌŠg’£—p
                 Result := '???';
+            end else if Length(convpw) = 0 then begin
+                // ¶ƒL[•ûŽ®ƒGƒ‰[
+                Result := '???';
             end else if Length(convpw) = 8 then begin
                 Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
             end else begin