uunicorn-sandbox-argv-dispatch.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128
  1. diff --git a/hello.cc b/hello.cc
  2. index b1a095c..3222033 100644
  3. --- a/hello.cc
  4. +++ b/hello.cc
  5. @@ -1489,7 +1489,7 @@ operator << (std::basic_ostream<wchar_t> &os, WINBIO_REGISTERED_FORMAT r)
  6. return os << L"Owher=" << r.Owner << L", Type=" << r.Type;
  7. }
  8. -void
  9. +int
  10. identifyFeatureSet()
  11. {
  12. //char ibuf[0x2000] = { 0 };
  13. @@ -1507,9 +1507,19 @@ identifyFeatureSet()
  14. for(LONG_PTR i=0;i<req.informationSize;i++)
  15. printf("%02x", obuf[i]);
  16. printf("\n");
  17. +
  18. + /* verify-only flow: did the enrolled record come back? */
  19. + for(LONG_PTR i=0;i+7<=req.informationSize;i++) {
  20. + if(memcmp(obuf+i, "Unicorn", 7) == 0) {
  21. + printf("MATCH: enrolled record found\n");
  22. + return 0;
  23. + }
  24. + }
  25. + printf("NO MATCH\n");
  26. + return 1;
  27. }
  28. -void
  29. +int
  30. identify()
  31. {
  32. char ibuf[1024*10];
  33. @@ -1595,7 +1605,7 @@ identify()
  34. printf("sz=%lld\n", (PUCHAR)(hdr+1) - data->CaptureData.Data);
  35. }
  36. }
  37. - identifyFeatureSet();
  38. + return identifyFeatureSet();
  39. }
  40. void
  41. @@ -1646,7 +1656,7 @@ reset()
  42. printf("\r\n");
  43. }
  44. -void
  45. +int
  46. enroll()
  47. {
  48. Sleep(500);
  49. @@ -1749,6 +1759,8 @@ enroll()
  50. Sleep(1000);
  51. commitEnrollment();
  52. +
  53. + return 0;
  54. }
  55. void
  56. @@ -2398,9 +2410,10 @@ struct breakpoint breakpoints[] = {
  57. { "00000001800D8C34", (unsigned char *)0x00000001800D8C34, handle_export_out },
  58. };
  59. -void
  60. +int
  61. nop()
  62. {
  63. + return 0;
  64. }
  65. void
  66. @@ -2414,10 +2427,9 @@ int
  67. main(int argc, char *argv[])
  68. {
  69. char *br = getenv("SANDBOX_BREAKPOINTS");
  70. - void (*what)();
  71. + int (*what)();
  72. IClassFactory *fact = 0;
  73. -#if 0
  74. if(argc != 2) {
  75. usage();
  76. return 3;
  77. @@ -2436,7 +2448,6 @@ main(int argc, char *argv[])
  78. usage();
  79. return 3;
  80. }
  81. -#endif
  82. HMODULE pDll = LoadLibrary("synawudfbiousb.dll");
  83. if(!pDll) {
  84. @@ -2542,16 +2553,26 @@ main(int argc, char *argv[])
  85. setMode(2); // WINBIO_SENSOR_ADVANCED_MODE
  86. - //what();
  87. - enroll();
  88. -
  89. - printf("======================================================\r\n");
  90. - printf("Sleeping 10 secons....\r\n");
  91. - printf("======================================================\r\n");
  92. - Sleep(10000);
  93. + int status = 0;
  94. +
  95. + if(what == enroll) {
  96. + enroll();
  97. - identify();
  98. + printf("======================================================\r\n");
  99. + printf("Sleeping 10 secons....\r\n");
  100. + printf("======================================================\r\n");
  101. + Sleep(10000);
  102. +
  103. + status = identify();
  104. + }
  105. + else if(what == identify) {
  106. + status = identify();
  107. + }
  108. + else {
  109. + status = what(); /* nop */
  110. + }
  111. printf("about to de-init\r\n");
  112. inst->OnDeinitialize(aDriver);
  113. + return status;
  114. }