bulletin-board-server-frontend/build.gradle

@@ -42,7 +42,8 @@ task generateProtobufBundle(type: NpmTask) {
     // We need do this in doFirst since getProtoFiles won't find all subprojects
     // until after configuration is complete
     def protoFiles = getProtoFiles()
-    generateProtobufBundle.args = ['run', 'protoc', '--' ] + protoFiles;
+    setEnvironment([PROTO_FILES: protoFiles.join(" ")]);
+    generateProtobufBundle.args = ['run', 'protoc']
   }
 
   dependsOn npm_install

bulletin-board-server-frontend/generate-protobuf.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-const { execFileSync } = require('child_process');
-const  path  = require('path');
-
-const isWin = (process.platform === 'win32');
-
-const bundlejs = 'src/app/bundle.js'
-const bundlets = 'src/app/bundle.d.ts'
-
-const npm = isWin ? 'npm.cmd' : 'npm';
-
-
-var args = process.argv.slice(2).map(function(x) {
-  return path.normalize(x);
-});
-
-
-var pbjs_args = [
-  '-t', 'static-module', '-w', 'commonjs', '-o', bundlejs
-].concat(args);
-
-console.log("Running pbjs " + pbjs_args.join(" "));
-var out = execFileSync(npm, ['run', 'pbjs', '--'].concat(pbjs_args));
-console.log("" + out);
-
-var pbts_args = [
-  '-o', bundlets, bundlejs
-];
-
-console.log("Running pbts " + pbts_args.join(" "));
-out = execFileSync(npm, ['run', 'pbts', '--'].concat(pbts_args));
-console.log("" + out);

bulletin-board-server-frontend/package.json

@@ -10,7 +10,7 @@
     "lint": "ng e2e",
     "pbts": "pbts",
     "pbjs": "pbjs",
-    "protoc" : "node ./generate-protobuf.js"
+    "protoc" : "pbjs -t static-module -w commonjs -o src/app/bundle.js $PROTO_FILES && pbts -o src/app/bundle.d.ts src/app/bundle.js"
   },
   "private": true,
   "dependencies": {

gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.2.1-all.zip
-distributionSha256Sum=7897b59fb45148cd8a79f078e5e4cef3861a252dd1a1af729d0c6e8a0a8703a8
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionSha256Sum=a0af75d3d35799a90f56255a24de69c53cd9aea90f0b532586c8f818668e1734

mixer/docs/mixer.md

@@ -15,7 +15,7 @@ For future compatibility, each ciphertext actually written to disk is encoded as
 Ciphertexts are serialized using the [ElGamalCiphertext](concrete_crypto.proto) message, with fields "c1" and "c2" for the first and second group elements.
 
 ### EC Group elements
-Group elements use the [GroupElement](concrete_crypto.proto) message. Its only field is "data", which should be an ASN.1-encoded curve point with compression (see section 4.3.6 of  [X9.62-1998](https://www.security-audit.com/files/x9-62-09-20-98.pdf) "Public Key Cryptography For The Financial Services Industry: The Elliptic Curve Digital  Signature Algorithm (ECDSA)")
+Group elements use the [GroupElement](concrete_crypto.proto) message. It's only field is "data", which should be an ASN.1-encoded curve point with compression (see section 4.3.6 of  [X9.62-1998](https://www.security-audit.com/files/x9-62-09-20-98.pdf) "Public Key Cryptography For The Financial Services Industry: The Elliptic Curve Digital  Signature Algorithm (ECDSA)")
 
 ### EC-ElGamal Key Format
 The ECElGamal Key is stored in the [ElGamalPublicKey](concrete_crypto.proto) message that contains a standard DER-encoded SubjectPublicKeyInfo as in [RFC 3279](https://tools.ietf.org/html/rfc3279)  (note that this encoding includes the elliptic-curve group parameters).