Develop and Download Open Source Software

Browse CVS Repository

Diff of /gikonavigoeson/gikonavi/Trip.pas

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.6 by h677, Sun Jun 21 11:42:44 2009 UTC revision 1.7 by h677, Mon Nov 23 13:12:49 2009 UTC
# Line 435  begin Line 435  begin
435              if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and              if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and
436                  (Pos(pw[2*i + 1 + 1], '0123456789abcdefABCDEF') > 0) then begin                  (Pos(pw[2*i + 1 + 1], '0123456789abcdefABCDEF') > 0) then begin
437                  convpw := convpw +                  convpw := convpw +
438                      Char(StrToInt( pw[2*i + 0 + 1] ) shl 4 + StrToInt( pw[2*i + 1 + 1] ));                      Char(StrToInt( 'x' + pw[2*i + 0 + 1] ) shl 4 + StrToInt( 'x'  + pw[2*i + 1 + 1] ));
439              end else begin              end else begin
440                  convpw := '';                  convpw := '';
441                  Break;                  Break;
# Line 498  begin Line 498  begin
498              if pw[ 0 ] = '#' then begin              if pw[ 0 ] = '#' then begin
499                  get_pw_salt(pw, convpw, salt);                  get_pw_salt(pw, convpw, salt);
500              end;              end;
501              if Length(convpw) = 8 then begin              if (pw[ 0 ] = '#') and (Length(pw) >= 12) then begin
502                    // 将来の拡張用
503                    Result := '???';
504                end else if Length(convpw) = 8 then begin
505                  Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );                  Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
506              end else begin              end else begin
507                  // 新方式                  // 新方式

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26