Bug 1380529 - Add a CBOR library for WebAuthn (1/3) r=ttaubert
authorJ.C. Jones <jjones@mozilla.com>
Thu, 13 Jul 2017 18:12:57 -0700
changeset 418940 45b4405c24ca291e24053c708c4620a9bda73438
parent 418888 4e853e81c2be70c041fbae19e4e30dc7e97e86c2
child 418941 070367125549ebd34250ffc4078784890ebea619
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert
bugs1380529
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1380529 - Add a CBOR library for WebAuthn (1/3) r=ttaubert Web Authentication's WD-05 specification moves to using (CBOR) Concise Binary Object Representation to transmit the binary data... most of it. This lands a subset of the Apache 2-licensed "CBOR C++" serialization library [1] into webauthn's path. It does not add any code to use this library; see patch 2/3. [1] https://github.com/naphaso/cbor-cpp/ MozReview-Commit-ID: Ktj9TgdqElk
dom/webauthn/cbor-cpp/README.md
dom/webauthn/cbor-cpp/src/LICENSE
dom/webauthn/cbor-cpp/src/README-MOZILLA
dom/webauthn/cbor-cpp/src/cbor.h
dom/webauthn/cbor-cpp/src/encoder.cpp
dom/webauthn/cbor-cpp/src/encoder.h
dom/webauthn/cbor-cpp/src/output.h
dom/webauthn/cbor-cpp/src/output_dynamic.cpp
dom/webauthn/cbor-cpp/src/output_dynamic.h
dom/webauthn/moz.build
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/README.md
@@ -0,0 +1,35 @@
+cbor-cpp
+========
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/naphaso/cbor-cpp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+CBOR C++ serialization library
+
+Just a simple SAX-like Concise Binary Object Representation (CBOR).
+
+[http://tools.ietf.org/html/rfc7049](http://tools.ietf.org/html/rfc7049)
+
+#### Examples
+
+```C++
+    cbor::output_dynamic output;
+
+    { //encoding
+        cbor::encoder encoder(output);
+        encoder.write_array(5);
+        {
+            encoder.write_int(123);
+            encoder.write_string("bar");
+            encoder.write_int(321);
+            encoder.write_int(321);
+            encoder.write_string("foo");
+        }
+    }
+
+    { // decoding
+        cbor::input input(output.data(), output.size());
+        cbor::listener_debug listener;
+        cbor::decoder decoder(input, listener);
+        decoder.run();
+    }
+```
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/README-MOZILLA
@@ -0,0 +1,5 @@
+This library [1] has been stripped down to only the CBOR encoding parts, as there are outstanding issues [2]
+related to memory safety for the decoder.
+
+[1] https://github.com/naphaso/cbor-cpp/
+[2] https://github.com/naphaso/cbor-cpp/issues/8
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/cbor.h
@@ -0,0 +1,23 @@
+/*
+   Copyright 2014-2015 Stanislav Ovsyannikov
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+*/
+
+#ifndef CBOR_CPP_CBOR_H
+#define CBOR_CPP_CBOR_H
+
+#include "encoder.h"
+#include "output_dynamic.h"
+
+#endif //CBOR_CPP_CBOR_H
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/encoder.cpp
@@ -0,0 +1,150 @@
+/*
+   Copyright 2014-2015 Stanislav Ovsyannikov
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+*/
+
+#include "encoder.h"
+
+using namespace cbor;
+
+
+encoder::encoder(output &out) {
+    _out = &out;
+}
+
+encoder::~encoder() {
+
+}
+
+void encoder::write_type_value(int major_type, unsigned int value) {
+    major_type <<= 5;
+    if(value < 24) {
+        _out->put_byte((unsigned char) (major_type | value));
+    } else if(value < 256) {
+        _out->put_byte((unsigned char) (major_type | 24));
+        _out->put_byte((unsigned char) value);
+    } else if(value < 65536) {
+        _out->put_byte((unsigned char) (major_type | 25));
+        _out->put_byte((unsigned char) (value >> 8));
+        _out->put_byte((unsigned char) value);
+    } else {
+        _out->put_byte((unsigned char) (major_type | 26));
+        _out->put_byte((unsigned char) (value >> 24));
+        _out->put_byte((unsigned char) (value >> 16));
+        _out->put_byte((unsigned char) (value >> 8));
+        _out->put_byte((unsigned char) value);
+    }
+}
+
+void encoder::write_type_value(int major_type, unsigned long long value) {
+    major_type <<= 5;
+    if(value < 24ULL) {
+        _out->put_byte((unsigned char) (major_type | value));
+    } else if(value < 256ULL) {
+        _out->put_byte((unsigned char) (major_type | 24));
+        _out->put_byte((unsigned char) value);
+    } else if(value < 65536ULL) {
+        _out->put_byte((unsigned char) (major_type | 25));
+        _out->put_byte((unsigned char) (value >> 8));
+        _out->put_byte((unsigned char) value);
+    } else if(value < 4294967296ULL) {
+        _out->put_byte((unsigned char) (major_type | 26));
+        _out->put_byte((unsigned char) (value >> 24));
+        _out->put_byte((unsigned char) (value >> 16));
+        _out->put_byte((unsigned char) (value >> 8));
+        _out->put_byte((unsigned char) value);
+    } else {
+        _out->put_byte((unsigned char) (major_type | 27));
+        _out->put_byte((unsigned char) (value >> 56));
+        _out->put_byte((unsigned char) (value >> 48));
+        _out->put_byte((unsigned char) (value >> 40));
+        _out->put_byte((unsigned char) (value >> 32));
+        _out->put_byte((unsigned char) (value >> 24));
+        _out->put_byte((unsigned char) (value >> 16));
+        _out->put_byte((unsigned char) (value >> 8));
+        _out->put_byte((unsigned char) value);
+    }
+}
+
+void encoder::write_int(unsigned int value) {
+    write_type_value(0, value);
+}
+
+void encoder::write_int(unsigned long long value) {
+    write_type_value(0, value);
+}
+
+void encoder::write_int(long long value) {
+    if(value < 0) {
+        write_type_value(1, (unsigned long long) -(value+1));
+    } else {
+        write_type_value(0, (unsigned long long) value);
+    }
+}
+
+void encoder::write_int(int value) {
+    if(value < 0) {
+        write_type_value(1, (unsigned int) -(value+1));
+    } else {
+        write_type_value(0, (unsigned int) value);
+    }
+}
+
+void encoder::write_bytes(const unsigned char *data, unsigned int size) {
+    write_type_value(2, size);
+    _out->put_bytes(data, size);
+}
+
+void encoder::write_string(const char *data, unsigned int size) {
+    write_type_value(3, size);
+    _out->put_bytes((const unsigned char *) data, size);
+}
+
+void encoder::write_string(const std::string str) {
+    write_type_value(3, (unsigned int) str.size());
+    _out->put_bytes((const unsigned char *) str.c_str(), (int) str.size());
+}
+
+
+void encoder::write_array(int size) {
+    write_type_value(4, (unsigned int) size);
+}
+
+void encoder::write_map(int size) {
+    write_type_value(5, (unsigned int) size);
+}
+
+void encoder::write_tag(const unsigned int tag) {
+    write_type_value(6, tag);
+}
+
+void encoder::write_special(int special) {
+    write_type_value(7, (unsigned int) special);
+}
+
+void encoder::write_bool(bool value) {
+    if (value == true) {
+        _out->put_byte((unsigned char) 0xf5);
+    } else {
+        _out->put_byte((unsigned char) 0xf4);
+    }
+}
+
+void encoder::write_null() {
+    _out->put_byte((unsigned char) 0xf6);
+}
+
+void encoder::write_undefined() {
+    _out->put_byte((unsigned char) 0xf7);
+}
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/encoder.h
@@ -0,0 +1,68 @@
+/*
+   Copyright 2014-2015 Stanislav Ovsyannikov
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+*/
+
+
+#ifndef __CborEncoder_H_
+#define __CborEncoder_H_
+
+#include "output.h"
+#include <string>
+
+namespace cbor {
+    class encoder {
+    private:
+        output *_out;
+    public:
+        explicit encoder(output &out);
+
+        ~encoder();
+
+        void write_bool(bool value);
+
+        void write_int(int value);
+
+        void write_int(long long value);
+
+        void write_int(unsigned int value);
+
+        void write_int(unsigned long long value);
+
+        void write_bytes(const unsigned char *data, unsigned int size);
+
+        void write_string(const char *data, unsigned int size);
+
+        void write_string(const std::string str);
+
+        void write_array(int size);
+
+        void write_map(int size);
+
+        void write_tag(const unsigned int tag);
+
+        void write_special(int special);
+
+        void write_null();
+
+        void write_undefined();
+
+    private:
+        void write_type_value(int major_type, unsigned int value);
+
+        void write_type_value(int major_type, unsigned long long value);
+    };
+}
+
+#endif //__CborEncoder_H_
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/output.h
@@ -0,0 +1,34 @@
+/*
+   Copyright 2014-2015 Stanislav Ovsyannikov
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+*/
+
+
+#ifndef __CborOutput_H_
+#define __CborOutput_H_
+
+namespace cbor {
+    class output {
+    public:
+        virtual unsigned char *data() = 0;
+
+        virtual unsigned int size() = 0;
+
+        virtual void put_byte(unsigned char value) = 0;
+
+        virtual void put_bytes(const unsigned char *data, int size) = 0;
+    };
+}
+
+#endif //__CborOutput_H_
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/output_dynamic.cpp
@@ -0,0 +1,69 @@
+/*
+   Copyright 2014-2015 Stanislav Ovsyannikov
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+*/
+
+#include "output_dynamic.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+using namespace cbor;
+
+
+void output_dynamic::init(unsigned int initalCapacity) {
+    this->_capacity = initalCapacity;
+    this->_buffer = new unsigned char[initalCapacity];
+    this->_offset = 0;
+}
+
+output_dynamic::output_dynamic() {
+    init(256);
+}
+
+output_dynamic::output_dynamic(unsigned int inital_capacity) {
+    init(inital_capacity);
+}
+
+output_dynamic::~output_dynamic() {
+    delete _buffer;
+}
+
+unsigned char *output_dynamic::data() {
+    return _buffer;
+}
+
+unsigned int output_dynamic::size() {
+    return _offset;
+}
+
+void output_dynamic::put_byte(unsigned char value) {
+    if(_offset < _capacity) {
+        _buffer[_offset++] = value;
+    } else {
+        _capacity *= 2;
+        _buffer = (unsigned char *) realloc(_buffer, _capacity);
+        _buffer[_offset++] = value;
+    }
+}
+
+void output_dynamic::put_bytes(const unsigned char *data, int size) {
+    while(_offset + size > _capacity) {
+        _capacity *= 2;
+        _buffer = (unsigned char *) realloc(_buffer, _capacity);
+    }
+
+    memcpy(_buffer + _offset, data, size);
+    _offset += size;
+}
new file mode 100644
--- /dev/null
+++ b/dom/webauthn/cbor-cpp/src/output_dynamic.h
@@ -0,0 +1,51 @@
+/*
+   Copyright 2014-2015 Stanislav Ovsyannikov
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+*/
+
+#ifndef __CborDynamicOutput_H_
+#define __CborDynamicOutput_H_
+
+
+#include "output.h"
+
+namespace cbor {
+    class output_dynamic : public output {
+    private:
+        unsigned char *_buffer;
+        unsigned int _capacity;
+        unsigned int _offset;
+    public:
+        output_dynamic();
+
+        explicit output_dynamic(unsigned int inital_capacity);
+
+        ~output_dynamic();
+
+        virtual unsigned char *data();
+
+        virtual unsigned int size();
+
+        virtual void put_byte(unsigned char value);
+
+        virtual void put_bytes(const unsigned char *data, int size);
+
+    private:
+        void init(unsigned int initalCapacity);
+    };
+}
+
+
+
+#endif //__CborDynamicOutput_H_
--- a/dom/webauthn/moz.build
+++ b/dom/webauthn/moz.build
@@ -20,32 +20,34 @@ EXPORTS.mozilla.dom += [
     'U2FHIDTokenManager.h',
     'U2FSoftTokenManager.h',
     'U2FTokenManager.h',
     'U2FTokenTransport.h',
     'WebAuthnManager.h',
     'WebAuthnRequest.h',
     'WebAuthnTransactionChild.h',
     'WebAuthnTransactionParent.h',
-    'WebAuthnUtil.h'
+    'WebAuthnUtil.h',
 ]
 
 UNIFIED_SOURCES += [
     'AuthenticatorAssertionResponse.cpp',
     'AuthenticatorAttestationResponse.cpp',
     'AuthenticatorResponse.cpp',
+    'cbor-cpp/src/encoder.cpp',
+    'cbor-cpp/src/output_dynamic.cpp',
     'NSSU2FTokenRemote.cpp',
     'PublicKeyCredential.cpp',
     'U2FHIDTokenManager.cpp',
     'U2FSoftTokenManager.cpp',
     'U2FTokenManager.cpp',
     'WebAuthnManager.cpp',
     'WebAuthnTransactionChild.cpp',
     'WebAuthnTransactionParent.cpp',
-    'WebAuthnUtil.cpp'
+    'WebAuthnUtil.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/base',