Revision | f92e561dfcb990b50d2f05ef5ad8d32b7df7d558 (tree) |
---|---|
Zeit | 2009-11-24 22:42:14 |
Autor | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_62_0_803'.
@@ -264,7 +264,7 @@ const | ||
264 | 264 | ZERO_DATE: Integer = 25569; |
265 | 265 | BETA_VERSION_NAME_E = 'beta'; |
266 | 266 | BETA_VERSION_NAME_J = 'バタ'; |
267 | - BETA_VERSION = 61; | |
267 | + BETA_VERSION = 62; | |
268 | 268 | BETA_VERSION_BUILD = ''; //!< debug版など |
269 | 269 | APP_NAME = 'gikoNavi'; |
270 | 270 | BE_PHP_URL = 'http://be.2ch.net/test/p.php?i='; |
@@ -435,7 +435,7 @@ begin | ||
435 | 435 | if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and |
436 | 436 | (Pos(pw[2*i + 1 + 1], '0123456789abcdefABCDEF') > 0) then begin |
437 | 437 | convpw := convpw + |
438 | - Char(StrToInt( pw[2*i + 0 + 1] ) shl 4 + StrToInt( pw[2*i + 1 + 1] )); | |
438 | + Char(StrToInt( 'x' + pw[2*i + 0 + 1] ) shl 4 + StrToInt( 'x' + pw[2*i + 1 + 1] )); | |
439 | 439 | end else begin |
440 | 440 | convpw := ''; |
441 | 441 | Break; |
@@ -498,7 +498,10 @@ begin | ||
498 | 498 | if pw[ 0 ] = '#' then begin |
499 | 499 | get_pw_salt(pw, convpw, salt); |
500 | 500 | end; |
501 | - if Length(convpw) = 8 then begin | |
501 | + if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin | |
502 | + // 将来の拡張用 | |
503 | + Result := '???'; | |
504 | + end else if Length(convpw) = 8 then begin | |
502 | 505 | Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 ); |
503 | 506 | end else begin |
504 | 507 | // 新方式 |
@@ -1,4 +1,4 @@ | ||
1 | -■ギコナビ Version1.00 バタ61 Readme.txt | |
1 | +■ギコナビ Version1.00 バタ62 Readme.txt | |
2 | 2 | |
3 | 3 | |
4 | 4 | ------------------------------ |
@@ -121,6 +121,9 @@ LICENSE | ||
121 | 121 | ------------------------------ |
122 | 122 | 履歴 |
123 | 123 | ------------------------------ |
124 | +200X/XX/XX | |
125 | + Version バタ62 | |
126 | + | |
124 | 127 | 2009/10/18 |
125 | 128 | Version バタ61 |
126 | 129 | したらばJBBSでスレッドを建てることができない不具合の修正 |