re-introduce old nss im too tired for this

security/nss/cpputil/Makefile

@@ -30,6 +30,8 @@ endif
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
+include config.mk
+
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################

security/nss/cpputil/config.mk

@@ -0,0 +1,15 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =
+

security/nss/cpputil/databuffer.cc

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */

security/nss/cpputil/databuffer.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,7 +7,6 @@
 #define databuffer_h__
 
 #include <algorithm>
-#include <cstdint>
 #include <cstring>
 #include <iomanip>
 #include <iostream>
@@ -24,7 +22,6 @@ class DataBuffer {
   DataBuffer(const DataBuffer& other) : data_(nullptr), len_(0) {
     Assign(other);
   }
-  explicit DataBuffer(size_t l) : data_(nullptr), len_(0) { Allocate(l); }
   ~DataBuffer() { delete[] data_; }
 
   DataBuffer& operator=(const DataBuffer& other) {
@@ -33,16 +30,6 @@ class DataBuffer {
     }
     return *this;
   }
-  DataBuffer& operator=(DataBuffer&& other) {
-    if (this != &other) {
-      delete[] data_;
-      data_ = other.data_;
-      len_ = other.len_;
-      other.data_ = nullptr;
-      other.len_ = 0;
-    }
-    return *this;
-  }
 
   void Allocate(size_t l) {
     delete[] data_;

security/nss/cpputil/freebl_scoped_ptrs.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */

security/nss/cpputil/manifest.mn

@@ -6,9 +6,7 @@ CORE_DEPTH = ..
 DEPTH      = ..
 
 MODULE = nss
-
 LIBRARY_NAME = cpputil
-SHARED_LIBRARY = $(NULL)
 
 ifeq ($(NSS_BUILD_UTIL_ONLY),1)
 CPPSRCS = \
@@ -21,3 +19,6 @@ CPPSRCS = \
       tls_parser.cc \
       $(NULL)
 endif
+
+EXPORTS = \
+      $(NULL)

security/nss/cpputil/nss_scoped_ptrs.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,12 +7,9 @@
 #define nss_scoped_ptrs_h__
 
 #include <memory>
-
 #include "cert.h"
 #include "keyhi.h"
-#include "nss.h"
 #include "p12.h"
-#include "pk11hpke.h"
 #include "pk11pqg.h"
 #include "pk11pub.h"
 #include "pkcs11uri.h"
@@ -30,9 +26,6 @@ struct ScopedDelete {
   void operator()(CERTSubjectPublicKeyInfo* spki) {
     SECKEY_DestroySubjectPublicKeyInfo(spki);
   }
-  void operator()(HpkeContext* context) {
-    PK11_HPKE_DestroyContext(context, true);
-  }
   void operator()(PK11Context* context) { PK11_DestroyContext(context, true); }
   void operator()(PK11GenericObject* obj) { PK11_DestroyGenericObject(obj); }
   void operator()(PK11SlotInfo* slot) { PK11_FreeSlot(slot); }
@@ -65,7 +58,6 @@ struct ScopedDelete {
   void operator()(SEC_PKCS7ContentInfo* cinfo) {
     SEC_PKCS7DestroyContentInfo(cinfo);
   }
-  void operator()(NSSInitContext* init) { NSS_ShutdownContext(init); }
 };
 
 template <class T>
@@ -86,8 +78,6 @@ SCOPED(CERTCertificateList);
 SCOPED(CERTDistNames);
 SCOPED(CERTName);
 SCOPED(CERTSubjectPublicKeyInfo);
-SCOPED(HpkeContext);
-SCOPED(NSSInitContext);
 SCOPED(PK11Context);
 SCOPED(PK11GenericObject);
 SCOPED(PK11SlotInfo);

security/nss/cpputil/scoped_ptrs_smime.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */

security/nss/cpputil/scoped_ptrs_ssl.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -12,7 +11,6 @@
 
 struct ScopedDeleteSSL {
   void operator()(SSLAeadContext* ctx) { SSL_DestroyAead(ctx); }
-  void operator()(SSLMaskingContext* ctx) { SSL_DestroyMaskingContext(ctx); }
   void operator()(SSLAntiReplayContext* ctx) {
     SSL_ReleaseAntiReplayContext(ctx);
   }
@@ -35,7 +33,6 @@ struct ScopedMaybeDeleteSSL {
 
 SCOPED(SSLAeadContext);
 SCOPED(SSLAntiReplayContext);
-SCOPED(SSLMaskingContext);
 SCOPED(SSLResumptionTokenInfo);
 
 #undef SCOPED

security/nss/cpputil/scoped_ptrs_util.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */

security/nss/cpputil/tls_parser.cc

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */

security/nss/cpputil/tls_parser.h

@@ -1,5 +1,4 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -56,7 +55,6 @@ const uint8_t kTlsAlertUnsupportedExtension = 110;
 const uint8_t kTlsAlertUnrecognizedName = 112;
 const uint8_t kTlsAlertCertificateRequired = 116;
 const uint8_t kTlsAlertNoApplicationProtocol = 120;
-const uint8_t kTlsAlertEchRequired = 121;
 
 const uint8_t kTlsFakeChangeCipherSpec[] = {
     ssl_ct_change_cipher_spec,  // Type
@@ -75,11 +73,6 @@ const uint8_t kTlsFakeChangeCipherSpec[] = {
     0x01   // Value
 };
 
-const uint8_t kCtDtlsCiphertext = 0x20;
-const uint8_t kCtDtlsCiphertextMask = 0xE0;
-const uint8_t kCtDtlsCiphertext16bSeqno = 0x08;
-const uint8_t kCtDtlsCiphertextLengthPresent = 0x04;
-
 static const uint8_t kTls13PskKe = 0;
 static const uint8_t kTls13PskDhKe = 1;
 static const uint8_t kTls13PskAuth = 0;