Browse CVS Repository
Diff of /gikonavigoeson/gikonavi/Trip.pas
Parent Directory
| Revision Log
| Revision Graph
| Patch
| 494 |
Result := '???'; |
Result := '???'; |
| 495 |
end else begin |
end else begin |
| 496 |
convpw := ''; |
convpw := ''; |
|
// 生キー方式 |
|
|
if pw[ 0 ] = '#' then begin |
|
|
get_pw_salt(pw, convpw, salt); |
|
|
end; |
|
| 497 |
if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin |
if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin |
| 498 |
// 将来の拡張用 |
// 将来の拡張用 |
| 499 |
Result := '???'; |
Result := '???'; |
| 500 |
end else if Length(convpw) = 0 then begin |
end else if pw[ 0 ] = '#' then begin |
| 501 |
// 生キー方式エラー |
// 生キー方式 |
| 502 |
Result := '???'; |
get_pw_salt(pw, convpw, salt); |
| 503 |
end else if Length(convpw) = 8 then begin |
if Length(convpw) = 0 then begin |
| 504 |
Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 ); |
// 生キー方式エラー |
| 505 |
|
Result := '???'; |
| 506 |
|
end else if Length(convpw) = 8 then begin |
| 507 |
|
Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 ); |
| 508 |
|
end |
| 509 |
end else begin |
end else begin |
| 510 |
// 新方式 |
// 新方式 |
| 511 |
StringHashSHA1(digest, pw); |
StringHashSHA1(digest, pw); |
|
|
Legend:
| Removed from v.1.9 |
|
| changed lines |
| |
Added in v.1.10 |
|
|
| |