Overview
Comment: | More work towards getting ChromeOS extension going |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9e8c8d099762f421649855186c7c8141 |
User & Date: | rkeene on 2016-02-10 23:04:54 |
Other Links: | manifest | tags |
Context
2016-02-10
| ||
23:06 | ChromeOS: better cleanup check-in: 82721ca5b6 user: rkeene tags: trunk | |
23:04 | More work towards getting ChromeOS extension going check-in: 9e8c8d0997 user: rkeene tags: trunk | |
2016-02-04
| ||
22:52 | Added more Chrome extension parts check-in: e9e86eb240 user: rkeene tags: trunk | |
Changes
Modified .fossil-settings/ignore-glob from [52dd43d58b] to [6153c84cb9].
︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | + + + | build/certs test test-afl test-afl.data build/chrome/archive build/chrome/workdir-* build/chrome/lib build/chrome/include build/chrome/cackey-chrome.o build/chrome/cackey-chrome-init.o build/chrome/cackey.pexe build/chrome/cackey.nmf build/chrome/cackey.crx build/chrome/test build/chrome/google-pcsc.js |
Modified build/chrome/Makefile from [c9ad2816e9] to [f428275431].
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | - - + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + - - + + - - - + + + + + + + + | CC = pnacl-clang CXX = pnacl-clang++ AR = pnacl-ar RANLIB = pnacl-ranlib FINALIZE = pnacl-finalize CACKEY_LIBS = -Llib -lcackey -lz PCSC_LIBS = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp LIBS = $(CACKEY_LIBS) $(PCSC_LIBS) |
Modified build/chrome/build-deps from [93232701c1] to [c94a1830f2].
︙ | |||
225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | + + + + + + + + + + + + + + - + + + | ( cd "${workdir}" || exit 1 # Copy out PC/SC headers for later use mkdir -p "${instdir}/include/PCSC" || exit 1 cp third_party/pcsc-lite/src/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1 # Copy out extra headers cat << \_EOF_ > "${instdir}/include/PCSC/pcsc-nacl.h" #ifndef PCSC_NACL_H #define PCSC_NACL_H 1 #ifdef __cplusplus #include <ppapi/cpp/core.h> #include <ppapi/cpp/instance.h> void pcscNaClInit(pp::Instance *instance, pp::Core *core); #endif #endif _EOF_ # Copy out JavaScript files for later use mkdir "${instdir}/js" || exit 1 cp common-utils/*.js "${instdir}/js" || exit 1 cp third_party/pcsc-lite/client-side/*.js "${instdir}/js" || exit 1 # Build libpcsc ## Assemble all the files into a single tree for file in logging.h scard_structs_serialization.h dom_requests_manager.h thread_safe_string_pool.h \ pp_var_utils.cc pp_var_utils.h scard_structs_serialization.cc dom_requests_manager.cc logging.cc; do find . -type f -name "${file}" -exec cp '{}' third_party/pcsc-lite/client-side/ ';' done ## Create Makefile cat << \_EOF_ > third_party/pcsc-lite/client-side/Makefile || exit 1 CFLAGS += -Wall -std=gnu++11 CXXFLAGS += -Wall -std=gnu++11 CPPFLAGS += -I../src/src/PCSC |
︙ | |||
276 277 278 279 280 281 282 283 284 285 286 287 288 289 | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | rm -f $(OBJS) rm -f libpcsc.a distclean: clean .PHONY: all clean distclean _EOF_ ## Create initialization procedure, since it lacks one cat << \_EOF_ > third_party/pcsc-lite/client-side/pcsc_nacl_init.cc #include <ppapi/cpp/core.h> #include <ppapi/cpp/instance.h> #include <stdio.h> #include "pcsc_nacl_global.h" #include "dom_requests_manager.h" #include "pcsc_nacl.h" void pcscNaClInit(pp::Instance *instance, pp::Core *core) { DomRequestsManager::PpDelegateImpl *drmDelegateImpl; PcscNacl *pcsc_nacl; fprintf(stderr, "Called pcscNaClInit()\n"); drmDelegateImpl = new DomRequestsManager::PpDelegateImpl(instance, core); pcsc_nacl = new PcscNacl(new DomRequestsManager("pcsc-nacl", drmDelegateImpl), "nahamlodapjneockbbogcleglpoillcn", "client"); fprintf(stderr, "New PcscNacl object = %p\n", pcsc_nacl); if (!pcsc_nacl->Initialize()) { fprintf(stderr, "PcscNacl->Initialize() failed !"); return; } fprintf(stderr, "Global instance set to %p\n", pcsc_nacl); SetPcscNaclGlobalInstance(pcsc_nacl); fprintf(stderr, "Returning.\n"); return; } _EOF_ ## Make it make -C third_party/pcsc-lite/client-side || exit 1 # Install the built libpcsc mkdir -p "${instdir}/lib" || exit 1 cp third_party/pcsc-lite/client-side/libpcsc.a "${instdir}/lib" || exit 1 |
︙ |
Modified build/chrome/cackey-chrome-init.cc from [5c1f40635b] to [f6b7a728d2].
|
Added build/chrome/cackey-chrome-test.c version [5b31fe8fb3].
|
Modified build/chrome/cackey-chrome.c from [5afb8e1152] to [b0e4dd691b].
|
Added build/chrome/cackey-chrome.h version [3dcc1f6bc2].
|
Modified build/chrome/cackey.js from [5ad72ed1f7] to [1a209c8c6b].
︙ | |||
295 296 297 298 299 300 301 302 303 304 305 306 307 308 | 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | /* MARK2 */ function onCertificatesRejected(rejectedCerts) { // If certificates were rejected by the API, log an error, for example. console.error(rejectedCerts.length + ' certificates were rejected.'); return; } var cackeyHandle = null; function cackeyInitLoaded(messageEvent) { console.log("Loaded CACKey PNaCl Module"); /* Register listeners with Chrome */ chrome.certificateProvider.onCertificatesRequested.addListener(cackeyListCertificates); chrome.certificateProvider.onSignDigestRequested.addListener(cackeySignMessage); } function cackeyInit() { var elementEmbed; if (cackeyHandle != null) { return; } elementEmbed = document.createElement('embed'); elementEmbed.type = "application/x-pnacl"; elementEmbed.width = 0; elementEmbed.height = 0; elementEmbed.src = "cackey.nmf"; elementEmbed.id = "cackeyModule"; elementEmbed.addEventListener('error', function(messageEvent) { console.error("Error loading CACKey PNaCl Module: " + messageEvent.data); }, true); elementEmbed.addEventListener('load', cackeyInitLoaded, true); elementEmbed.addEventListener('message', function(messageEvent) { console.log("Start message"); console.log(messageEvent.data); console.log("End message"); }, true); new GoogleSmartCard.PcscNacl(elementEmbed); document.body.appendChild(elementEmbed) cackeyHandle = elementEmbed; } function cackeyListCertificates(chromeCallback) { var certificates = []; certificates.push( { certificate: new Uint8Array([ |
︙ | |||
384 385 386 387 388 389 390 | 418 419 420 421 422 423 424 425 426 427 428 429 | - - - + + + + + | payload = new Uint8Array(stoBA(hextorstr(payload))).buffer; chromeCallback(payload); return; } |
Modified build/chrome/manifest.json from [11edb13438] to [ac9702d30b].
1 2 3 4 5 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | + - - - + + + + + + + | { "manifest_version": 2, "name": "CACKey", "version": "0.7.5.1", "app": { |