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.8 by h677, Tue Nov 24 13:41:50 2009 UTC revision 1.9 by h677, Thu Mar 18 14:09:04 2010 UTC
# Line 424  procedure get_pw_salt( Line 424  procedure get_pw_salt(
424      const pw : PChar;      const pw : PChar;
425      var convpw : String;      var convpw : String;
426      const salt : PChar      const salt : PChar
427  );  ) ;
428  var  var
429      i : integer;      i : integer;
430  begin  begin
431      // ^([0-9A-Fa-f]{16})([./0-9A-Za-z]{0,2})$      // ^([0-9A-Fa-f]{16})([./0-9A-Za-z]{0,2})$
432      if (Length(pw) >= 17) or (Length(pw) <= 19) then begin      if (Length(pw) >= 17) and (Length(pw) <= 19) then begin
433          // キー部分          // キー部分
434          for  i := 0 to 7 do begin          for  i := 0 to 7 do begin
435              if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and              if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and
# Line 501  begin Line 501  begin
501              if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin              if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
502                  // 将来の拡張用                  // 将来の拡張用
503                  Result := '???';                  Result := '???';
504                end else if Length(convpw) = 0 then begin
505                    // 生キー方式エラー
506                    Result := '???';
507              end else if Length(convpw) = 8 then begin              end else if Length(convpw) = 8 then begin
508                  Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );                  Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
509              end else begin              end else begin

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9

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