1 diff --git a/third_party/prio/LICENSE b/third_party/prio/LICENSE

     2 deleted file mode 100644

     3 --- a/third_party/prio/LICENSE

     4 +++ /dev/null

     5 @@ -1,373 +0,0 @@

     6 -Mozilla Public License Version 2.0

     7 -==================================

     8 -

     9 -1. Definitions

    10 ---------------

    11 -

    12 -1.1. "Contributor"

    13 -    means each individual or legal entity that creates, contributes to

    14 -    the creation of, or owns Covered Software.

    15 -

    16 -1.2. "Contributor Version"

    17 -    means the combination of the Contributions of others (if any) used

    18 -    by a Contributor and that particular Contributor's Contribution.

    19 -

    20 -1.3. "Contribution"

    21 -    means Covered Software of a particular Contributor.

    22 -

    23 -1.4. "Covered Software"

    24 -    means Source Code Form to which the initial Contributor has attached

    25 -    the notice in Exhibit A, the Executable Form of such Source Code

    26 -    Form, and Modifications of such Source Code Form, in each case

    27 -    including portions thereof.

    28 -

    29 -1.5. "Incompatible With Secondary Licenses"

    30 -    means

    31 -

    32 -    (a) that the initial Contributor has attached the notice described

    33 -        in Exhibit B to the Covered Software; or

    34 -

    35 -    (b) that the Covered Software was made available under the terms of

    36 -        version 1.1 or earlier of the License, but not also under the

    37 -        terms of a Secondary License.

    38 -

    39 -1.6. "Executable Form"

    40 -    means any form of the work other than Source Code Form.

    41 -

    42 -1.7. "Larger Work"

    43 -    means a work that combines Covered Software with other material, in

    44 -    a separate file or files, that is not Covered Software.

    45 -

    46 -1.8. "License"

    47 -    means this document.

    48 -

    49 -1.9. "Licensable"

    50 -    means having the right to grant, to the maximum extent possible,

    51 -    whether at the time of the initial grant or subsequently, any and

    52 -    all of the rights conveyed by this License.

    53 -

    54 -1.10. "Modifications"

    55 -    means any of the following:

    56 -

    57 -    (a) any file in Source Code Form that results from an addition to,

    58 -        deletion from, or modification of the contents of Covered

    59 -        Software; or

    60 -

    61 -    (b) any new file in Source Code Form that contains any Covered

    62 -        Software.

    63 -

    64 -1.11. "Patent Claims" of a Contributor

    65 -    means any patent claim(s), including without limitation, method,

    66 -    process, and apparatus claims, in any patent Licensable by such

    67 -    Contributor that would be infringed, but for the grant of the

    68 -    License, by the making, using, selling, offering for sale, having

    69 -    made, import, or transfer of either its Contributions or its

    70 -    Contributor Version.

    71 -

    72 -1.12. "Secondary License"

    73 -    means either the GNU General Public License, Version 2.0, the GNU

    74 -    Lesser General Public License, Version 2.1, the GNU Affero General

    75 -    Public License, Version 3.0, or any later versions of those

    76 -    licenses.

    77 -

    78 -1.13. "Source Code Form"

    79 -    means the form of the work preferred for making modifications.

    80 -

    81 -1.14. "You" (or "Your")

    82 -    means an individual or a legal entity exercising rights under this

    83 -    License. For legal entities, "You" includes any entity that

    84 -    controls, is controlled by, or is under common control with You. For

    85 -    purposes of this definition, "control" means (a) the power, direct

    86 -    or indirect, to cause the direction or management of such entity,

    87 -    whether by contract or otherwise, or (b) ownership of more than

    88 -    fifty percent (50%) of the outstanding shares or beneficial

    89 -    ownership of such entity.

    90 -

    91 -2. License Grants and Conditions

    92 ---------------------------------

    93 -

    94 -2.1. Grants

    95 -

    96 -Each Contributor hereby grants You a world-wide, royalty-free,

    97 -non-exclusive license:

    98 -

    99 -(a) under intellectual property rights (other than patent or trademark)

   100 -    Licensable by such Contributor to use, reproduce, make available,

   101 -    modify, display, perform, distribute, and otherwise exploit its

   102 -    Contributions, either on an unmodified basis, with Modifications, or

   103 -    as part of a Larger Work; and

   104 -

   105 -(b) under Patent Claims of such Contributor to make, use, sell, offer

   106 -    for sale, have made, import, and otherwise transfer either its

   107 -    Contributions or its Contributor Version.

   108 -

   109 -2.2. Effective Date

   110 -

   111 -The licenses granted in Section 2.1 with respect to any Contribution

   112 -become effective for each Contribution on the date the Contributor first

   113 -distributes such Contribution.

   114 -

   115 -2.3. Limitations on Grant Scope

   116 -

   117 -The licenses granted in this Section 2 are the only rights granted under

   118 -this License. No additional rights or licenses will be implied from the

   119 -distribution or licensing of Covered Software under this License.

   120 -Notwithstanding Section 2.1(b) above, no patent license is granted by a

   121 -Contributor:

   122 -

   123 -(a) for any code that a Contributor has removed from Covered Software;

   124 -    or

   125 -

   126 -(b) for infringements caused by: (i) Your and any other third party's

   127 -    modifications of Covered Software, or (ii) the combination of its

   128 -    Contributions with other software (except as part of its Contributor

   129 -    Version); or

   130 -

   131 -(c) under Patent Claims infringed by Covered Software in the absence of

   132 -    its Contributions.

   133 -

   134 -This License does not grant any rights in the trademarks, service marks,

   135 -or logos of any Contributor (except as may be necessary to comply with

   136 -the notice requirements in Section 3.4).

   137 -

   138 -2.4. Subsequent Licenses

   139 -

   140 -No Contributor makes additional grants as a result of Your choice to

   141 -distribute the Covered Software under a subsequent version of this

   142 -License (see Section 10.2) or under the terms of a Secondary License (if

   143 -permitted under the terms of Section 3.3).

   144 -

   145 -2.5. Representation

   146 -

   147 -Each Contributor represents that the Contributor believes its

   148 -Contributions are its original creation(s) or it has sufficient rights

   149 -to grant the rights to its Contributions conveyed by this License.

   150 -

   151 -2.6. Fair Use

   152 -

   153 -This License is not intended to limit any rights You have under

   154 -applicable copyright doctrines of fair use, fair dealing, or other

   155 -equivalents.

   156 -

   157 -2.7. Conditions

   158 -

   159 -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted

   160 -in Section 2.1.

   161 -

   162 -3. Responsibilities

   163 --------------------

   164 -

   165 -3.1. Distribution of Source Form

   166 -

   167 -All distribution of Covered Software in Source Code Form, including any

   168 -Modifications that You create or to which You contribute, must be under

   169 -the terms of this License. You must inform recipients that the Source

   170 -Code Form of the Covered Software is governed by the terms of this

   171 -License, and how they can obtain a copy of this License. You may not

   172 -attempt to alter or restrict the recipients' rights in the Source Code

   173 -Form.

   174 -

   175 -3.2. Distribution of Executable Form

   176 -

   177 -If You distribute Covered Software in Executable Form then:

   178 -

   179 -(a) such Covered Software must also be made available in Source Code

   180 -    Form, as described in Section 3.1, and You must inform recipients of

   181 -    the Executable Form how they can obtain a copy of such Source Code

   182 -    Form by reasonable means in a timely manner, at a charge no more

   183 -    than the cost of distribution to the recipient; and

   184 -

   185 -(b) You may distribute such Executable Form under the terms of this

   186 -    License, or sublicense it under different terms, provided that the

   187 -    license for the Executable Form does not attempt to limit or alter

   188 -    the recipients' rights in the Source Code Form under this License.

   189 -

   190 -3.3. Distribution of a Larger Work

   191 -

   192 -You may create and distribute a Larger Work under terms of Your choice,

   193 -provided that You also comply with the requirements of this License for

   194 -the Covered Software. If the Larger Work is a combination of Covered

   195 -Software with a work governed by one or more Secondary Licenses, and the

   196 -Covered Software is not Incompatible With Secondary Licenses, this

   197 -License permits You to additionally distribute such Covered Software

   198 -under the terms of such Secondary License(s), so that the recipient of

   199 -the Larger Work may, at their option, further distribute the Covered

   200 -Software under the terms of either this License or such Secondary

   201 -License(s).

   202 -

   203 -3.4. Notices

   204 -

   205 -You may not remove or alter the substance of any license notices

   206 -(including copyright notices, patent notices, disclaimers of warranty,

   207 -or limitations of liability) contained within the Source Code Form of

   208 -the Covered Software, except that You may alter any license notices to

   209 -the extent required to remedy known factual inaccuracies.

   210 -

   211 -3.5. Application of Additional Terms

   212 -

   213 -You may choose to offer, and to charge a fee for, warranty, support,

   214 -indemnity or liability obligations to one or more recipients of Covered

   215 -Software. However, You may do so only on Your own behalf, and not on

   216 -behalf of any Contributor. You must make it absolutely clear that any

   217 -such warranty, support, indemnity, or liability obligation is offered by

   218 -You alone, and You hereby agree to indemnify every Contributor for any

   219 -liability incurred by such Contributor as a result of warranty, support,

   220 -indemnity or liability terms You offer. You may include additional

   221 -disclaimers of warranty and limitations of liability specific to any

   222 -jurisdiction.

   223 -

   224 -4. Inability to Comply Due to Statute or Regulation

   225 ----------------------------------------------------

   226 -

   227 -If it is impossible for You to comply with any of the terms of this

   228 -License with respect to some or all of the Covered Software due to

   229 -statute, judicial order, or regulation then You must: (a) comply with

   230 -the terms of this License to the maximum extent possible; and (b)

   231 -describe the limitations and the code they affect. Such description must

   232 -be placed in a text file included with all distributions of the Covered

   233 -Software under this License. Except to the extent prohibited by statute

   234 -or regulation, such description must be sufficiently detailed for a

   235 -recipient of ordinary skill to be able to understand it.

   236 -

   237 -5. Termination

   238 ---------------

   239 -

   240 -5.1. The rights granted under this License will terminate automatically

   241 -if You fail to comply with any of its terms. However, if You become

   242 -compliant, then the rights granted under this License from a particular

   243 -Contributor are reinstated (a) provisionally, unless and until such

   244 -Contributor explicitly and finally terminates Your grants, and (b) on an

   245 -ongoing basis, if such Contributor fails to notify You of the

   246 -non-compliance by some reasonable means prior to 60 days after You have

   247 -come back into compliance. Moreover, Your grants from a particular

   248 -Contributor are reinstated on an ongoing basis if such Contributor

   249 -notifies You of the non-compliance by some reasonable means, this is the

   250 -first time You have received notice of non-compliance with this License

   251 -from such Contributor, and You become compliant prior to 30 days after

   252 -Your receipt of the notice.

   253 -

   254 -5.2. If You initiate litigation against any entity by asserting a patent

   255 -infringement claim (excluding declaratory judgment actions,

   256 -counter-claims, and cross-claims) alleging that a Contributor Version

   257 -directly or indirectly infringes any patent, then the rights granted to

   258 -You by any and all Contributors for the Covered Software under Section

   259 -2.1 of this License shall terminate.

   260 -

   261 -5.3. In the event of termination under Sections 5.1 or 5.2 above, all

   262 -end user license agreements (excluding distributors and resellers) which

   263 -have been validly granted by You or Your distributors under this License

   264 -prior to termination shall survive termination.

   265 -

   266 -************************************************************************

   267 -*                                                                      *

   268 -*  6. Disclaimer of Warranty                                           *

   269 -*  -------------------------                                           *

   270 -*                                                                      *

   271 -*  Covered Software is provided under this License on an "as is"       *

   272 -*  basis, without warranty of any kind, either expressed, implied, or  *

   273 -*  statutory, including, without limitation, warranties that the       *

   274 -*  Covered Software is free of defects, merchantable, fit for a        *

   275 -*  particular purpose or non-infringing. The entire risk as to the     *

   276 -*  quality and performance of the Covered Software is with You.        *

   277 -*  Should any Covered Software prove defective in any respect, You     *

   278 -*  (not any Contributor) assume the cost of any necessary servicing,   *

   279 -*  repair, or correction. This disclaimer of warranty constitutes an   *

   280 -*  essential part of this License. No use of any Covered Software is   *

   281 -*  authorized under this License except under this disclaimer.         *

   282 -*                                                                      *

   283 -************************************************************************

   284 -

   285 -************************************************************************

   286 -*                                                                      *

   287 -*  7. Limitation of Liability                                          *

   288 -*  --------------------------                                          *

   289 -*                                                                      *

   290 -*  Under no circumstances and under no legal theory, whether tort      *

   291 -*  (including negligence), contract, or otherwise, shall any           *

   292 -*  Contributor, or anyone who distributes Covered Software as          *

   293 -*  permitted above, be liable to You for any direct, indirect,         *

   294 -*  special, incidental, or consequential damages of any character      *

   295 -*  including, without limitation, damages for lost profits, loss of    *

   296 -*  goodwill, work stoppage, computer failure or malfunction, or any    *

   297 -*  and all other commercial damages or losses, even if such party      *

   298 -*  shall have been informed of the possibility of such damages. This   *

   299 -*  limitation of liability shall not apply to liability for death or   *

   300 -*  personal injury resulting from such party's negligence to the       *

   301 -*  extent applicable law prohibits such limitation. Some               *

   302 -*  jurisdictions do not allow the exclusion or limitation of           *

   303 -*  incidental or consequential damages, so this exclusion and          *

   304 -*  limitation may not apply to You.                                    *

   305 -*                                                                      *

   306 -************************************************************************

   307 -

   308 -8. Litigation

   309 --------------

   310 -

   311 -Any litigation relating to this License may be brought only in the

   312 -courts of a jurisdiction where the defendant maintains its principal

   313 -place of business and such litigation shall be governed by laws of that

   314 -jurisdiction, without reference to its conflict-of-law provisions.

   315 -Nothing in this Section shall prevent a party's ability to bring

   316 -cross-claims or counter-claims.

   317 -

   318 -9. Miscellaneous

   319 -----------------

   320 -

   321 -This License represents the complete agreement concerning the subject

   322 -matter hereof. If any provision of this License is held to be

   323 -unenforceable, such provision shall be reformed only to the extent

   324 -necessary to make it enforceable. Any law or regulation which provides

   325 -that the language of a contract shall be construed against the drafter

   326 -shall not be used to construe this License against a Contributor.

   327 -

   328 -10. Versions of the License

   329 ----------------------------

   330 -

   331 -10.1. New Versions

   332 -

   333 -Mozilla Foundation is the license steward. Except as provided in Section

   334 -10.3, no one other than the license steward has the right to modify or

   335 -publish new versions of this License. Each version will be given a

   336 -distinguishing version number.

   337 -

   338 -10.2. Effect of New Versions

   339 -

   340 -You may distribute the Covered Software under the terms of the version

   341 -of the License under which You originally received the Covered Software,

   342 -or under the terms of any subsequent version published by the license

   343 -steward.

   344 -

   345 -10.3. Modified Versions

   346 -

   347 -If you create software not governed by this License, and you want to

   348 -create a new license for such software, you may create and use a

   349 -modified version of this License if you rename the license and remove

   350 -any references to the name of the license steward (except to note that

   351 -such modified license differs from this License).

   352 -

   353 -10.4. Distributing Source Code Form that is Incompatible With Secondary

   354 -Licenses

   355 -

   356 -If You choose to distribute Source Code Form that is Incompatible With

   357 -Secondary Licenses under the terms of this version of the License, the

   358 -notice described in Exhibit B of this License must be attached.

   359 -

   360 -Exhibit A - Source Code Form License Notice

   361 --------------------------------------------

   362 -

   363 -  This Source Code Form is subject to the terms of the Mozilla Public

   364 -  License, v. 2.0. If a copy of the MPL was not distributed with this

   365 -  file, You can obtain one at http://mozilla.org/MPL/2.0/.

   366 -

   367 -If it is not possible or desirable to put the notice in a particular

   368 -file, then You may include the notice in a location (such as a LICENSE

   369 -file in a relevant directory) where a recipient would be likely to look

   370 -for such a notice.

   371 -

   372 -You may add additional accurate notices of copyright ownership.

   373 -

   374 -Exhibit B - "Incompatible With Secondary Licenses" Notice

   375 ----------------------------------------------------------

   376 -

   377 -  This Source Code Form is "Incompatible With Secondary Licenses", as

   378 -  defined by the Mozilla Public License, v. 2.0.

   379 diff --git a/third_party/prio/README-mozilla b/third_party/prio/README-mozilla

   380 --- a/third_party/prio/README-mozilla

   381 +++ b/third_party/prio/README-mozilla

   382 @@ -1,7 +1,7 @@

   383  This directory contains the Prio source from the upstream repo:

   384  https://github.com/mozilla/libprio

   385  

   386 -Current version: 1.0 [commit bfbcf1f95001047c61f4a29c3e68499b2f0c9f3b]

   387 +Current version: 1.1 [commit 488da2d729d73f18ed45add59edd18b257e1ceaa]

   388  

   389  UPDATING:

   390  

   391 @@ -14,4 +14,4 @@

   392  from within the third_party/libprio directory.

   393  

   394  If the collection of source files changes, manual updates to moz.build may be

   395 -needed as we don't use the upstream makefiles.

   396 \ No newline at end of file

   397 +needed as we don't use the upstream makefiles.

   398 diff --git a/third_party/prio/README.md b/third_party/prio/README.md

   399 deleted file mode 100644

   400 --- a/third_party/prio/README.md

   401 +++ /dev/null

   402 @@ -1,136 +0,0 @@

   403 -# libprio - A Prio library in C using NSS 

   404 -

   405 -**Warning:**

   406 -We do our best to write bug-free code, but I have no doubt

   407 -that there are scary bugs, side-channel attacks, and memory leaks 

   408 -lurking herein. 

   409 -

   410 -**Important:**

   411 -We have not yet implemented the items

   412 -described in the "Security-Critical TODOs" section below.

   413 -Without these features, do not use the code in a production environment.

   414 -

   415 -

   416 -## Overview

   417 -

   418 -This is an implementation of the core cryptographic routines

   419 -for the [Prio system](https://crypto.stanford.edu/prio/) 

   420 -for the private computation of aggregate statistics:

   421 -> "Prio: Private, Robust, and Scalable Computation of Aggregate Statistics"<br>

   422 -> by Henry Corrigan-Gibbs and Dan Boneh<br>

   423 -> USENIX Symposium on Networked Systems Design and Implementation<br>

   424 -> March 2017

   425 ->

   426 -> Available online at:

   427 ->    https://crypto.stanford.edu/prio/

   428 -

   429 -**Usage scenario.**

   430 -The library implements the cryptographic routines necessary

   431 -for the following application scenario:

   432 -Each client holds a vector of boolean values.

   433 -Each client uses the library to encode her private vector into two 

   434 -encoded packets—one for server A and one for server B.

   435 -

   436 -After receiving shares from a client, the servers can use the routines

   437 -implemented here to check whether the client-provided packets are 

   438 -well formed. 

   439 -(Without this check, a single malicious client can corrupt the

   440 -output of the computation.)

   441 -

   442 -After collecting data packets from many clients, the servers

   443 -can combine their state to learn how many clients had the

   444 -*i*th bit of their data vector set to `true` and how many

   445 -clients had the *i*th bit of their data vector set to `false`.

   446 -As long as at least one of the two servers is honest 

   447 -(i.e., runs the correct code), 

   448 -the servers learn *nothing else* about the clients' data, 

   449 -under standard cryptographic assumptions.

   450 -

   451 -For example, the *i*th bit of the data vector could indicate

   452 -whether the client ever visited the *i*th-ranked website

   453 -in the Alexa Top 500.

   454 -The servers would learn how many clients visited each of the 

   455 -Top 500 websites *without learning* which clients visited

   456 -which websites.

   457 -

   458 -**Efficiency considerations.**

   459 -The code makes no use of public-key crypto, so it should 

   460 -be relatively fast.

   461 -When each a data packet is of length *N*, 

   462 -all arithmetic is modulo a prime *p* (we use an 87-bit prime by default), 

   463 -and "elements" are integers modulo *p*, 

   464 -the dominant costs of the system are:

   465 -* **Client compute:** O(*N* log *N*) multiplications 

   466 -* **Client-to-server communication:** 2*N* + O(1) elements<br>

   467 -* **Server compute:** O(*N* log *N*) multiplications to check each packet<br> 

   468 -    (NOTE: Using an optimization we haven't yet implemented, we can 

   469 -    drop this cost to O(*N*) multiplications per packet.)

   470 -* **Server-to-server communication:** O(1) elements

   471 -* **Server storage:** O(*N*) elements

   472 -

   473 -## Running the code

   474 -

   475 -You must first install 

   476 -[NSS/NSPR](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS), 

   477 -[scons](http://scons.org/), and 

   478 -[msgpack-c](https://github.com/msgpack/msgpack-c) version 2.1.5 (or newer?).

   479 -On Ubuntu, you can instal NSS and scons with:

   480 -

   481 -    $ sudo apt install scons libnspr4-dev libnss3-dev 

   482 -

   483 -and you will have to download [msgpack-c 2.1.5 or newer here](https://github.com/msgpack/msgpack-c/releases),

   484 -since the Ubuntu packages for msgpack are far out of date.

   485 -

   486 -For macOS using Homebrew:

   487 -    $ brew install nss nspr scons msgpack

   488 -

   489 -    $ export LDFLAGS="-L/usr/local/opt/nss/lib"

   490 -    $ export CPPFLAGS="-I/usr/local/opt/nss/include -I/usr/local/opt/nspr/include/nspr"

   491 -

   492 -To compile the code, run:

   493 -

   494 -    $ scons

   495 -

   496 -To run the test suite, execute:

   497 -

   498 -    $ build/ptest/ptest -v

   499 -

   500 -To print debug messages while compiling:

   501 -

   502 -    $ scons VERBOSE=1

   503 -

   504 -To compile with debug symbols, run:

   505 -

   506 -    $ scons BUILDTYPE=DEBUG

   507 -

   508 -To clean up the object and binary files, run:

   509 -

   510 -    $ scons -c

   511 -

   512 -The files in this directory are:

   513 -````

   514 -/build      - Binaries, object files, etc.

   515 -/include    - Exported header files

   516 -              (Note: The public header is <mprio.h> since

   517 -              NSPR already has a file called <prio.h>.)

   518 -/mpi        - NSS MPI bignum library 

   519 -/pclient    - Example code that uses the Prio library

   520 -/prio       - Prio library core code

   521 -/ptest      - Tests and test runner

   522 -````

   523 -

   524 -## Optimizations and features not yet implemented

   525 -* **Server compute.**

   526 -  By using a fast polynomial interpolation-and-evaluation

   527 -  routine, we can reduce the cost of checking a single client

   528 -  request from O(*N* log *N*) multiplications down to O(*N*)

   529 -  multiplications, for a data packet of *N* items.

   530 -* **Differential privacy.**

   531 -  It would be very straightforward to add some small amount of 

   532 -  noise to the final statistics to provide differential privacy.

   533 -  If this would be useful, I can add it.

   534 -* **Misc.**

   535 -  There are TODO notes scattered throughout code indicating

   536 -  places for potential performance optimizations.

   537 -  

   538 -

   539 diff --git a/third_party/prio/SConstruct b/third_party/prio/SConstruct

   540 deleted file mode 100644

   541 --- a/third_party/prio/SConstruct

   542 +++ /dev/null

   543 @@ -1,41 +0,0 @@

   544 -# This Source Code Form is subject to the terms of the Mozilla Public

   545 -# License, v. 2.0. If a copy of the MPL was not distributed with this

   546 -# file, You can obtain one at http://mozilla.org/MPL/2.0/.

   547 -

   548 -import os

   549 -import SCons

   550 -

   551 -opts = Variables()

   552 -opts.AddVariables(

   553 -    BoolVariable("DEBUG", "Make debug build", 1),

   554 -    BoolVariable("VERBOSE", "Show full build information", 0))

   555 -

   556 -env = Environment(options = opts,

   557 -                  ENV = os.environ)

   558 -if "CFLAGS" in os.environ:

   559 -  env.Append(CFLAGS = SCons.Util.CLVar(os.getenv("CFLAGS")))

   560 -if "CPPFLAGS" in os.environ:

   561 -  env.Append(CPPFLAGS = SCons.Util.CLVar(os.getenv("CPPFLAGS")))

   562 -if "CXXFLAGS" in os.environ:

   563 -  env.Append(CXXFLAGS = SCons.Util.CLVar(os.getenv("CXXFLAGS")))

   564 -if "LDFLAGS" in os.environ:

   565 -  env.Append(LINKFLAGS = SCons.Util.CLVar(os.getenv("LDFLAGS")))

   566 -

   567 -if env["DEBUG"]: 

   568 -    print "DEBUG MODE!"

   569 -    env.Append(CPPFLAGS = [ "-g", "-DDEBUG"])

   570 -

   571 -env.Append(LIBS = ["mprio", "mpi", "nss3", "nspr4"], \

   572 -  LIBPATH = ['#build/prio', "#build/mpi"],

   573 -  CFLAGS = [ "-Wall", "-Werror", "-Wextra", "-O3", "-std=c99", 

   574 -    "-I/usr/include/nspr", "-Impi", "-DDO_PR_CLEANUP"])

   575 -

   576 -env.Append(CPPPATH = ["#include", "#."])

   577 -Export('env')

   578 -

   579 -SConscript('browser-test/SConscript', variant_dir='build/browser-test')

   580 -SConscript('mpi/SConscript', variant_dir='build/mpi')

   581 -SConscript('pclient/SConscript', variant_dir='build/pclient')

   582 -SConscript('prio/SConscript', variant_dir='build/prio')

   583 -SConscript('ptest/SConscript', variant_dir='build/ptest')

   584 -

   585 diff --git a/third_party/prio/browser-test/SConscript b/third_party/prio/browser-test/SConscript

   586 deleted file mode 100644

   587 --- a/third_party/prio/browser-test/SConscript

   588 +++ /dev/null

   589 @@ -1,19 +0,0 @@

   590 -import sys

   591 -

   592 -Import('env')

   593 -

   594 -prio_env = env.Clone()

   595 -

   596 -src = [

   597 -    "main.c",

   598 -]

   599 -

   600 -libs = [

   601 -  "mprio",

   602 -  "msgpackc",

   603 -]

   604 -

   605 -prio_env.Append(LIBS = libs)

   606 -prio_env.Install("encode-once.js")

   607 -prio_env.Program("browser-test", src)

   608 -

   609 diff --git a/third_party/prio/browser-test/encode-once.js b/third_party/prio/browser-test/encode-once.js

   610 deleted file mode 100644

   611 --- a/third_party/prio/browser-test/encode-once.js

   612 +++ /dev/null

   613 @@ -1,45 +0,0 @@

   614 -/*

   615 - * Copyright (c) 2018, Henry Corrigan-Gibbs

   616 - * 

   617 - * This Source Code Form is subject to the terms of the Mozilla Public

   618 - * License, v. 2.0. If a copy of the MPL was not distributed with this

   619 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.

   620 - */

   621 -

   622 -ChromeUtils.import('resource://gre/modules/Services.jsm');

   623 -

   624 -let [publicKeyA, publicKeyB, batchID, param1, param2, param3] = arguments;

   625 -

   626 -Services.prefs.setStringPref('prio.publicKeyA', publicKeyA);

   627 -Services.prefs.setStringPref('prio.publicKeyB', publicKeyB);

   628 -

   629 -async function test() {

   630 -  let params =  {

   631 -    'startupCrashDetected': Number(param1),

   632 -    'safeModeUsage': Number(param2),

   633 -    'browserIsUserDefault': Number(param3)

   634 -  };

   635 -

   636 -  try {

   637 -    let result = await PrioEncoder.encode(batchID, params);

   638 -

   639 -    const toTypedArray = byteString => {

   640 -      let u8Array = new Uint8Array(byteString.length);

   641 -      for (let i in byteString) {

   642 -          u8Array[i] = byteString.charCodeAt(i);

   643 -      }

   644 -      return u8Array;

   645 -    }

   646 -

   647 -    const toHexString = bytes =>

   648 -      bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0') + ',', '');

   649 -

   650 -    console.log(toHexString(result.a) + '$' + toHexString(result.b));

   651 -    console.log('');

   652 -  } catch(e) {

   653 -    console.log('Failure.', e);

   654 -    console.log(v);

   655 -  }

   656 -}

   657 -

   658 -test().then();

   659 diff --git a/third_party/prio/browser-test/main.c b/third_party/prio/browser-test/main.c

   660 deleted file mode 100644

   661 --- a/third_party/prio/browser-test/main.c

   662 +++ /dev/null

   663 @@ -1,320 +0,0 @@

   664 -/*

   665 - * Copyright (c) 2018, Henry Corrigan-Gibbs

   666 - * 

   667 - * This Source Code Form is subject to the terms of the Mozilla Public

   668 - * License, v. 2.0. If a copy of the MPL was not distributed with this

   669 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.

   670 - */

   671 -

   672 -#define _GNU_SOURCE

   673 -

   674 -#include <mprio.h>

   675 -#include <stdio.h>

   676 -#include <stdlib.h>

   677 -#include <string.h>

   678 -#include <time.h>

   679 -

   680 -#include "prio/encrypt.h"

   681 -#include "prio/util.h"

   682 -

   683 -static void 

   684 -init_data (bool *data, int datalen) 

   685 -{

   686 -  // The client's data submission is an arbitrary boolean vector.

   687 -  for (int i=0; i < datalen; i++) {

   688 -    // Arbitrary data

   689 -    data[i] = rand () % 2;

   690 -  }

   691 -}

   692 -

   693 -static SECStatus

   694 -read_string_from_hex (unsigned char **str_out, unsigned int *strLen,

   695 -    const char *input, const char **new_input)

   696 -{

   697 -  SECStatus rv = SECSuccess;

   698 -  *strLen = 0;

   699 -  int read = 0;

   700 -  int outCount = 0;

   701 -  const char *inp = input;

   702 -

   703 -  while (true) {

   704 -    unsigned char byte = '\0';

   705 -    const int retval = sscanf(inp, "%02hhx,%n", &byte, &read);

   706 -    if (retval < 1 || read != 3) {

   707 -      break;

   708 -    }

   709 -

   710 -    inp += read;

   711 -    (*str_out)[outCount] = byte;

   712 -    outCount++;

   713 -    *strLen = *strLen + 1;

   714 -  }

   715 -

   716 -  if (new_input)

   717 -    *new_input = inp + 1;

   718 -

   719 -  return rv;

   720 -}

   721 -

   722 -static SECStatus

   723 -read_browser_reply (FILE *infile,

   724 -    unsigned char **for_server_a, unsigned int *aLen,

   725 -    unsigned char **for_server_b, unsigned int *bLen)

   726 -{

   727 -  SECStatus rv = SECFailure;

   728 -  char *raw_input = NULL;

   729 -  size_t rawLen = 0;

   730 -

   731 -  puts ("Getting line of input.");

   732 -  P_CHECKCB (getline (&raw_input, &rawLen, infile) > 0);

   733 -  puts ("Got line of input.");

   734 -

   735 -  P_CHECKA (*for_server_a = malloc (rawLen * sizeof (unsigned char)));

   736 -  P_CHECKA (*for_server_b = malloc (rawLen * sizeof (unsigned char)));

   737 -

   738 -  *aLen = 0;

   739 -  *bLen = 0;

   740 -

   741 -  P_CHECKCB (rawLen > 14);

   742 -

   743 -  // Header is 14 chars long

   744 -  const char *new_input;

   745 -  puts ("Reading string A");

   746 -  P_CHECKC (read_string_from_hex (for_server_a, aLen, raw_input + 14, &new_input));

   747 -  puts ("Read string A");

   748 -

   749 -  // Skip over for_server_a string and one-char delimeter

   750 -  puts ("Reading string B");

   751 -  P_CHECKC (read_string_from_hex (for_server_b, bLen, new_input, NULL));

   752 -  puts ("Read string B");

   753 -

   754 -cleanup:

   755 -  if (raw_input) free (raw_input);

   756 -  return rv;

   757 -}

   758 -

   759 -static int

   760 -verify_full (const char *path_to_xpcshell, int pathlen)

   761 -{

   762 -  SECStatus rv = SECSuccess;

   763 -

   764 -  PublicKey pkA = NULL;

   765 -  PublicKey pkB = NULL;

   766 -  PrivateKey skA = NULL;

   767 -  PrivateKey skB = NULL;

   768 -

   769 -  PrioConfig cfg = NULL;

   770 -  PrioServer sA = NULL;

   771 -  PrioServer sB = NULL;

   772 -  PrioVerifier vA = NULL;

   773 -  PrioVerifier vB = NULL;

   774 -  PrioPacketVerify1 p1A = NULL;

   775 -  PrioPacketVerify1 p1B = NULL;

   776 -  PrioPacketVerify2 p2A = NULL;

   777 -  PrioPacketVerify2 p2B = NULL;

   778 -  PrioTotalShare tA = NULL;

   779 -  PrioTotalShare tB = NULL;

   780 -

   781 -  FILE *shell = NULL;

   782 -  int cmdlen = pathlen + 2*CURVE25519_KEY_LEN_HEX + 128;

   783 -  char cmd[cmdlen];

   784 -  memset (cmd, 0, cmdlen);

   785 -

   786 -  unsigned char *for_server_a = NULL;

   787 -  unsigned char *for_server_b = NULL;

   788 -

   789 -  const int seed = time (NULL);

   790 -  srand (seed);

   791 -  printf ("Using srand seed %d\n", seed);

   792 -

   793 -  // Number of different boolean data fields we collect.

   794 -  const int ndata = 3;

   795 -

   796 -  //unsigned char batch_id_str[] = "abcde";

   797 -  unsigned char batch_id_str[32];

   798 -  memset (batch_id_str, 0, sizeof batch_id_str);

   799 -  snprintf ((char *)batch_id_str, sizeof batch_id_str, "%d", rand());

   800 -  

   801 -  bool data_items[ndata];

   802 -  unsigned long output[ndata];

   803 -  init_data (data_items, ndata);

   804 -

   805 -  // Initialize NSS random number generator.

   806 -  P_CHECKC (Prio_init ());

   807 -

   808 -  // Generate keypairs for servers

   809 -  P_CHECKC (Keypair_new (&skA, &pkA));

   810 -  P_CHECKC (Keypair_new (&skB, &pkB));

   811 -

   812 -  // Export public keys to hex and print to stdout

   813 -  unsigned char pk_hexA[CURVE25519_KEY_LEN_HEX+1];

   814 -  unsigned char pk_hexB[CURVE25519_KEY_LEN_HEX+1];

   815 -  P_CHECKC (PublicKey_export_hex (pkA, pk_hexA));

   816 -  P_CHECKC (PublicKey_export_hex (pkB, pk_hexB));

   817 -

   818 -  snprintf (cmd, cmdlen, "%s %s %s %s %s %d %d %d", 

   819 -      path_to_xpcshell, "encode-once.js", 

   820 -      pk_hexA, pk_hexB, batch_id_str, 

   821 -      data_items[0], data_items[1], data_items[2]);

   822 -

   823 -  printf ("> %s\n", cmd);

   824 -  P_CHECKA (shell = popen(cmd, "r"));

   825 -  puts("Ran command.");

   826 -

   827 -  // Use the default configuration parameters.

   828 -  P_CHECKA (cfg = PrioConfig_new (ndata, pkA, pkB, batch_id_str, 

   829 -        strlen ((char *)batch_id_str)));

   830 -

   831 -  PrioPRGSeed server_secret;

   832 -  P_CHECKC (PrioPRGSeed_randomize (&server_secret));

   833 -

   834 -  // Initialize two server objects. The role of the servers need not

   835 -  // be symmetric. In a deployment, we envision that:

   836 -  //   * Server A is the main telemetry server that is always online. 

   837 -  //     Clients send their encrypted data packets to Server A and

   838 -  //     Server A stores them.

   839 -  //   * Server B only comes online when the two servers want to compute

   840 -  //     the final aggregate statistics.

   841 -  P_CHECKA (sA = PrioServer_new (cfg, PRIO_SERVER_A, skA, server_secret));

   842 -  P_CHECKA (sB = PrioServer_new (cfg, PRIO_SERVER_B, skB, server_secret));

   843 -

   844 -  // Initialize empty verifier objects

   845 -  P_CHECKA (vA = PrioVerifier_new (sA)); 

   846 -  P_CHECKA (vB = PrioVerifier_new (sB));

   847 -

   848 -  // Initialize shares of final aggregate statistics

   849 -  P_CHECKA (tA = PrioTotalShare_new ());

   850 -  P_CHECKA (tB = PrioTotalShare_new ());

   851 -

   852 -  // Initialize shares of verification packets

   853 -  P_CHECKA (p1A = PrioPacketVerify1_new ());

   854 -  P_CHECKA (p1B = PrioPacketVerify1_new ());

   855 -  P_CHECKA (p2A = PrioPacketVerify2_new ());

   856 -  P_CHECKA (p2B = PrioPacketVerify2_new ());

   857 -

   858 -  // I. CLIENT DATA SUBMISSION.

   859 -  //

   860 -  // Read in the client data packets

   861 -  unsigned int aLen = 0, bLen = 0;

   862 -

   863 -  puts ("Reading...");

   864 -  P_CHECKC (read_browser_reply (shell, &for_server_a, &aLen, &for_server_b, &bLen));

   865 -  printf ("Read reply from browser. LenA: %u, LenB: %u\n", aLen, bLen);

   866 -

   867 -  // II. VALIDATION PROTOCOL. (at servers)

   868 -  //

   869 -  // The servers now run a short 2-step protocol to check each 

   870 -  // client's packet:

   871 -  //    1) Servers A and B broadcast one message (PrioPacketVerify1) 

   872 -  //       to each other.

   873 -  //    2) Servers A and B broadcast another message (PrioPacketVerify2)

   874 -  //       to each other.

   875 -  //    3) Servers A and B can both determine whether the client's data

   876 -  //       submission is well-formed (in which case they add it to their

   877 -  //       running total of aggregate statistics) or ill-formed

   878 -  //       (in which case they ignore it).

   879 -  // These messages must be sent over an authenticated channel, so

   880 -  // that each server is assured that every received message came 

   881 -  // from its peer.

   882 -

   883 -  // Set up a Prio verifier object.

   884 -  P_CHECKC (PrioVerifier_set_data (vA, for_server_a, aLen));

   885 -  P_CHECKC (PrioVerifier_set_data (vB, for_server_b, bLen));

   886 -  puts("Imported data.");

   887 -

   888 -  // Both servers produce a packet1. Server A sends p1A to Server B

   889 -  // and vice versa.

   890 -  P_CHECKC (PrioPacketVerify1_set_data (p1A, vA));

   891 -  P_CHECKC (PrioPacketVerify1_set_data (p1B, vB));

   892 -  puts("Set data.");

   893 -

   894 -  // Both servers produce a packet2. Server A sends p2A to Server B

   895 -  // and vice versa.

   896 -  P_CHECKC (PrioPacketVerify2_set_data(p2A, vA, p1A, p1B));

   897 -  P_CHECKC (PrioPacketVerify2_set_data(p2B, vB, p1A, p1B));

   898 -

   899 -  // Using p2A and p2B, the servers can determine whether the request

   900 -  // is valid. (In fact, only Server A needs to perform this 

   901 -  // check, since Server A can just tell Server B whether the check 

   902 -  // succeeded or failed.) 

   903 -  puts ("Checking validity.");

   904 -  P_CHECKC (PrioVerifier_isValid (vA, p2A, p2B)); 

   905 -  P_CHECKC (PrioVerifier_isValid (vB, p2A, p2B)); 

   906 -  puts ("Are valid.");

   907 -

   908 -  // If we get here, the client packet is valid, so add it to the aggregate

   909 -  // statistic counter for both servers.

   910 -  P_CHECKC (PrioServer_aggregate (sA, vA));

   911 -  P_CHECKC (PrioServer_aggregate (sB, vB));

   912 -

   913 -  // The servers repeat the steps above for each client submission.

   914 -

   915 -  // III. PRODUCTION OF AGGREGATE STATISTICS.

   916 -  //

   917 -  // After collecting aggregates from MANY clients, the servers can compute

   918 -  // their shares of the aggregate statistics. 

   919 -  //

   920 -  // Server B can send tB to Server A.

   921 -  P_CHECKC (PrioTotalShare_set_data (tA, sA));

   922 -  P_CHECKC (PrioTotalShare_set_data (tB, sB));

   923 -

   924 -  // Once Server A has tA and tB, it can learn the aggregate statistics

   925 -  // in the clear.

   926 -  P_CHECKC (PrioTotalShare_final (cfg, output, tA, tB));

   927 - 

   928 -  for (int i=0; i < ndata; i++) {

   929 -    //printf("output[%d] = %lu\n", i, output[i]);

   930 -    //printf("data[%d] = %d\n", i, (int)data_items[i]);

   931 -    P_CHECKCB (output[i] == data_items[i]);

   932 -  }

   933 -

   934 -  puts ("Success!");

   935 -

   936 -cleanup:

   937 -  if (rv != SECSuccess) {

   938 -    fprintf (stderr, "Warning: unexpected failure.\n");

   939 -  }

   940 -

   941 -  if (for_server_a) free (for_server_a);

   942 -  if (for_server_b) free (for_server_b);

   943 -

   944 -  PrioTotalShare_clear (tA);

   945 -  PrioTotalShare_clear (tB);

   946 -

   947 -  PrioPacketVerify2_clear (p2A);

   948 -  PrioPacketVerify2_clear (p2B);

   949 -

   950 -  PrioPacketVerify1_clear (p1A);

   951 -  PrioPacketVerify1_clear (p1B);

   952 -

   953 -  PrioVerifier_clear (vA);

   954 -  PrioVerifier_clear (vB);

   955 -

   956 -  PrioServer_clear (sA);

   957 -  PrioServer_clear (sB);

   958 -  PrioConfig_clear (cfg);

   959 -

   960 -  PublicKey_clear (pkA);

   961 -  PublicKey_clear (pkB);

   962 -

   963 -  PrivateKey_clear (skA);

   964 -  PrivateKey_clear (skB);

   965 -

   966 -  Prio_clear ();

   967 -

   968 -  return !(rv == SECSuccess);

   969 -}

   970 -

   971 -int 

   972 -main (int argc, char **argv)

   973 -{

   974 -  puts("== Prio browser test utility. ==");

   975 -  puts("(Note: Expects to be run in the same directory as encode-once.js.)");

   976 -  if (argc != 2) {

   977 -    fprintf (stderr, "Usage ./%s <path_to_xpcshell>\n", argv[0]);

   978 -    return 1;

   979 -  }

   980 -

   981 -  return verify_full (argv[1], strlen (argv[1]));

   982 -}

   983 -

   984 diff --git a/third_party/prio/include/mprio.h b/third_party/prio/include/mprio.h

   985 --- a/third_party/prio/include/mprio.h

   986 +++ b/third_party/prio/include/mprio.h

   987 @@ -1,6 +1,6 @@

   988  /*

   989   * Copyright (c) 2018, Henry Corrigan-Gibbs

   990 - * 

   991 + *

   992   *

   993   * This Source Code Form is subject to the terms of the Mozilla Public

   994   * License, v. 2.0. If a copy of the MPL was not distributed with this

   995 @@ -13,10 +13,10 @@

   996  extern "C" {

   997  #endif

   998  

   999 +#include <blapit.h>

  1000  #include <msgpack.h>

  1001 -#include <nss/blapit.h>

  1002 -#include <nss/pk11pub.h>

  1003 -#include <nss/seccomon.h>

  1004 +#include <pk11pub.h>

  1005 +#include <seccomon.h>

  1006  #include <stdbool.h>

  1007  #include <stddef.h>

  1008  

  1009 @@ -33,47 +33,44 @@

  1010  /*

  1011   * Type for each of the two servers.

  1012   */

  1013 -typedef enum {

  1014 -  PRIO_SERVER_A,

  1015 -  PRIO_SERVER_B

  1016 -} PrioServerId;

  1017 +typedef enum { PRIO_SERVER_A, PRIO_SERVER_B } PrioServerId;

  1018  

  1019  /*

  1020   * Opaque types

  1021   */

  1022 -typedef struct prio_config *PrioConfig;

  1023 -typedef const struct prio_config *const_PrioConfig;

  1024 +typedef struct prio_config* PrioConfig;

  1025 +typedef const struct prio_config* const_PrioConfig;

  1026  

  1027 -typedef struct prio_server *PrioServer;

  1028 -typedef const struct prio_server *const_PrioServer;

  1029 +typedef struct prio_server* PrioServer;

  1030 +typedef const struct prio_server* const_PrioServer;

  1031  

  1032 -typedef struct prio_verifier *PrioVerifier;

  1033 -typedef const struct prio_verifier *const_PrioVerifier;

  1034 +typedef struct prio_verifier* PrioVerifier;

  1035 +typedef const struct prio_verifier* const_PrioVerifier;

  1036  

  1037 -typedef struct prio_packet_verify1 *PrioPacketVerify1;

  1038 -typedef const struct prio_packet_verify1 *const_PrioPacketVerify1;

  1039 +typedef struct prio_packet_verify1* PrioPacketVerify1;

  1040 +typedef const struct prio_packet_verify1* const_PrioPacketVerify1;

  1041  

  1042 -typedef struct prio_packet_verify2 *PrioPacketVerify2;

  1043 -typedef const struct prio_packet_verify2 *const_PrioPacketVerify2;

  1044 +typedef struct prio_packet_verify2* PrioPacketVerify2;

  1045 +typedef const struct prio_packet_verify2* const_PrioPacketVerify2;

  1046  

  1047 -typedef struct prio_total_share *PrioTotalShare;

  1048 -typedef const struct prio_total_share *const_PrioTotalShare;

  1049 +typedef struct prio_total_share* PrioTotalShare;

  1050 +typedef const struct prio_total_share* const_PrioTotalShare;

  1051  

  1052 -typedef SECKEYPublicKey *PublicKey;

  1053 -typedef const SECKEYPublicKey *const_PublicKey;

  1054 +typedef SECKEYPublicKey* PublicKey;

  1055 +typedef const SECKEYPublicKey* const_PublicKey;

  1056  

  1057 -typedef SECKEYPrivateKey *PrivateKey;

  1058 -typedef const SECKEYPrivateKey *const_PrivateKey;

  1059 +typedef SECKEYPrivateKey* PrivateKey;

  1060 +typedef const SECKEYPrivateKey* const_PrivateKey;

  1061  

  1062 -/* 

  1063 +/*

  1064   * Initialize and clear random number generator state.

  1065   * You must call Prio_init() before using the library.

  1066   * To avoid memory leaks, call Prio_clear() afterwards.

  1067   */

  1068 -SECStatus Prio_init ();

  1069 +SECStatus Prio_init();

  1070  void Prio_clear();

  1071  

  1072 -/* 

  1073 +/*

  1074   * PrioConfig holds the system parameters. The two relevant things determined

  1075   * by the config object are:

  1076   *    (1) the number of data fields we are collecting, and

  1077 @@ -87,35 +84,37 @@

  1078   * Each set of aggregate statistics should use a different `batch_id`.

  1079   *

  1080   * `PrioConfig_new` does not keep a pointer to the `batch_id` string that the

  1081 - * caller passes in, so you may free the `batch_id` string as soon as 

  1082 + * caller passes in, so you may free the `batch_id` string as soon as

  1083   * `PrioConfig_new` returns.

  1084   */

  1085 -PrioConfig PrioConfig_new (int n_fields, PublicKey server_a, PublicKey server_b,

  1086 -    const unsigned char *batch_id, unsigned int batch_id_len);

  1087 -void PrioConfig_clear (PrioConfig cfg);

  1088 -int PrioConfig_numDataFields (const_PrioConfig cfg);

  1089 +PrioConfig PrioConfig_new(int n_fields, PublicKey server_a, PublicKey server_b,

  1090 +                          const unsigned char* batch_id,

  1091 +                          unsigned int batch_id_len);

  1092 +void PrioConfig_clear(PrioConfig cfg);

  1093 +int PrioConfig_numDataFields(const_PrioConfig cfg);

  1094  

  1095  /*

  1096 - * Create a PrioConfig object with no encryption keys.  This routine is 

  1097 + * Create a PrioConfig object with no encryption keys.  This routine is

  1098   * useful for testing, but PrioClient_encode() will always fail when used with

  1099   * this config.

  1100   */

  1101 -PrioConfig PrioConfig_newTest (int n_fields);

  1102 +PrioConfig PrioConfig_newTest(int n_fields);

  1103  

  1104 -

  1105 -/* 

  1106 +/*

  1107   * We use the PublicKey and PrivateKey objects for public-key encryption. Each

  1108   * Prio server has an associated public key, and the clients use these keys to

  1109   * encrypt messages to the servers.

  1110   */

  1111 -SECStatus Keypair_new (PrivateKey *pvtkey, PublicKey *pubkey);

  1112 +SECStatus Keypair_new(PrivateKey* pvtkey, PublicKey* pubkey);

  1113  

  1114  /*

  1115 - * Import a new curve25519 public key from the raw bytes given. The key passed in

  1116 + * Import a new curve25519 public key from the raw bytes given. The key passed

  1117 + * in

  1118   * as `data` should be of length `CURVE25519_KEY_LEN`. This function allocates

  1119   * a new PublicKey object, which the caller must free using `PublicKey_clear`.

  1120   */

  1121 -SECStatus PublicKey_import (PublicKey *pk, const unsigned char *data, unsigned int dataLen);

  1122 +SECStatus PublicKey_import(PublicKey* pk, const unsigned char* data,

  1123 +                           unsigned int dataLen);

  1124  

  1125  /*

  1126   * Import a new curve25519 public key from a hex string that contains only the

  1127 @@ -123,138 +122,136 @@

  1128   * length `CURVE25519_KEY_LEN_HEX`. This function allocates a new PublicKey

  1129   * object, which the caller must free using `PublicKey_clear`.

  1130   */

  1131 -SECStatus PublicKey_import_hex (PublicKey *pk, const unsigned char *hex_data,

  1132 -    unsigned int dataLen);

  1133 +SECStatus PublicKey_import_hex(PublicKey* pk, const unsigned char* hex_data,

  1134 +                               unsigned int dataLen);

  1135