@@ -520,34 +520,71 @@ bool CVerification_XAuthKey::Verification_XAuthKey_KeyInit(VERIFICATION_XAUTHKEY
520520 }
521521 if (ENUM_VERIFICATION_MODULE_HW_TYPE_UNKNOW == pSt_XAuthInfo->st_AuthRegInfo .enHWType )
522522 {
523- pSt_XAuthInfo->st_AuthRegInfo .enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD;
524- _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszBoardSerial );
523+ if (_tcsxlen (st_SDKSerial.tszBoardSerial ) > 0 )
524+ {
525+ pSt_XAuthInfo->st_AuthRegInfo .enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD;
526+ _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszBoardSerial );
527+ }
528+ else if (_tcsxlen (st_SDKSerial.tszDiskSerial ) > 0 )
529+ {
530+ pSt_XAuthInfo->st_AuthRegInfo .enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_DISK;
531+ _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszDiskSerial );
532+ }
533+ else
534+ {
535+ pSt_XAuthInfo->st_AuthRegInfo .enHWType = ENUM_VERIFICATION_MODULE_HW_TYPE_SYSTEM;
536+ _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszSystemSerial );
537+ }
525538 }
526539 else
527540 {
528541 if (ENUM_VERIFICATION_MODULE_HW_TYPE_CPU == pSt_XAuthInfo->st_AuthRegInfo .enHWType )
529542 {
543+ if (_tcsxlen (st_SDKSerial.tszCPUSerial ) == 0 )
544+ {
545+ Verification_IsErrorOccur = true ;
546+ Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_HWTYPE;
547+ return false ;
548+ }
530549 if (_tcsxlen (pSt_XAuthInfo->st_AuthRegInfo .tszHardware ) == 0 )
531550 {
532551 _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszCPUSerial );
533552 }
534553 }
535554 else if (ENUM_VERIFICATION_MODULE_HW_TYPE_DISK == pSt_XAuthInfo->st_AuthRegInfo .enHWType )
536555 {
556+ if (_tcsxlen (st_SDKSerial.tszDiskSerial ) == 0 )
557+ {
558+ Verification_IsErrorOccur = true ;
559+ Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_HWTYPE;
560+ return false ;
561+ }
537562 if (_tcsxlen (pSt_XAuthInfo->st_AuthRegInfo .tszHardware ) == 0 )
538563 {
539564 _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszDiskSerial );
540565 }
541566 }
542567 else if (ENUM_VERIFICATION_MODULE_HW_TYPE_BOARD == pSt_XAuthInfo->st_AuthRegInfo .enHWType )
543568 {
569+ if (_tcsxlen (st_SDKSerial.tszBoardSerial ) == 0 )
570+ {
571+ Verification_IsErrorOccur = true ;
572+ Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_HWTYPE;
573+ return false ;
574+ }
544575 if (_tcsxlen (pSt_XAuthInfo->st_AuthRegInfo .tszHardware ) == 0 )
545576 {
546577 _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszBoardSerial );
547578 }
548579 }
549580 else if (ENUM_VERIFICATION_MODULE_HW_TYPE_SYSTEM == pSt_XAuthInfo->st_AuthRegInfo .enHWType )
550581 {
582+ if (_tcsxlen (st_SDKSerial.tszSystemSerial ) == 0 )
583+ {
584+ Verification_IsErrorOccur = true ;
585+ Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_XAUTH_HWTYPE;
586+ return false ;
587+ }
551588 if (_tcsxlen (pSt_XAuthInfo->st_AuthRegInfo .tszHardware ) == 0 )
552589 {
553590 _xstprintf (pSt_XAuthInfo->st_AuthRegInfo .tszHardware , _X (" %s" ), st_SDKSerial.tszSystemSerial );
0 commit comments