mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-08-25 05:43:08 +09:00
d36d4eb674
- Added HACL*Poly1305 32-bit (INRIA/Microsoft) - Updated to final TLS 1.3 draft version (28) - Removed TLS 1.3 prerelease draft limit check - Removed NPN code - Enabled dev/urandom-only RNG on Linux with NSS_SEED_ONLY_DEV_URANDOM for non-standard environments - Fixed several bugs with TLS 1.3 negotiation - Updated internal certificate store - Added support for the TLS Record Size Limit Extension. - Fixed CVE-2018-0495 - Various security fixes in the ASN.1 code.
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
/* -*- 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/. */
|
|
|
|
#ifndef scoped_ptrs_h__
|
|
#define scoped_ptrs_h__
|
|
|
|
#include <memory>
|
|
#include "cert.h"
|
|
#include "keyhi.h"
|
|
#include "p12.h"
|
|
#include "pk11pub.h"
|
|
#include "pkcs11uri.h"
|
|
#include "sslexp.h"
|
|
|
|
struct ScopedDelete {
|
|
void operator()(CERTCertificate* cert) { CERT_DestroyCertificate(cert); }
|
|
void operator()(CERTCertificateList* list) {
|
|
CERT_DestroyCertificateList(list);
|
|
}
|
|
void operator()(CERTName* name) { CERT_DestroyName(name); }
|
|
void operator()(CERTCertList* list) { CERT_DestroyCertList(list); }
|
|
void operator()(CERTSubjectPublicKeyInfo* spki) {
|
|
SECKEY_DestroySubjectPublicKeyInfo(spki);
|
|
}
|
|
void operator()(PK11SlotInfo* slot) { PK11_FreeSlot(slot); }
|
|
void operator()(PK11SymKey* key) { PK11_FreeSymKey(key); }
|
|
void operator()(PRFileDesc* fd) { PR_Close(fd); }
|
|
void operator()(SECAlgorithmID* id) { SECOID_DestroyAlgorithmID(id, true); }
|
|
void operator()(SECItem* item) { SECITEM_FreeItem(item, true); }
|
|
void operator()(SECKEYPublicKey* key) { SECKEY_DestroyPublicKey(key); }
|
|
void operator()(SECKEYPrivateKey* key) { SECKEY_DestroyPrivateKey(key); }
|
|
void operator()(SECKEYPrivateKeyList* list) {
|
|
SECKEY_DestroyPrivateKeyList(list);
|
|
}
|
|
void operator()(PK11URI* uri) { PK11URI_DestroyURI(uri); }
|
|
void operator()(PLArenaPool* arena) { PORT_FreeArena(arena, PR_FALSE); }
|
|
void operator()(PK11Context* context) { PK11_DestroyContext(context, true); }
|
|
void operator()(PK11GenericObject* obj) { PK11_DestroyGenericObject(obj); }
|
|
void operator()(SSLResumptionTokenInfo* token) {
|
|
SSL_DestroyResumptionTokenInfo(token);
|
|
}
|
|
void operator()(SEC_PKCS12DecoderContext* dcx) {
|
|
SEC_PKCS12DecoderFinish(dcx);
|
|
}
|
|
void operator()(CERTDistNames* names) { CERT_FreeDistNames(names); }
|
|
};
|
|
|
|
template <class T>
|
|
struct ScopedMaybeDelete {
|
|
void operator()(T* ptr) {
|
|
if (ptr) {
|
|
ScopedDelete del;
|
|
del(ptr);
|
|
}
|
|
}
|
|
};
|
|
|
|
#define SCOPED(x) typedef std::unique_ptr<x, ScopedMaybeDelete<x> > Scoped##x
|
|
|
|
SCOPED(CERTCertificate);
|
|
SCOPED(CERTCertificateList);
|
|
SCOPED(CERTCertList);
|
|
SCOPED(CERTName);
|
|
SCOPED(CERTSubjectPublicKeyInfo);
|
|
SCOPED(PK11SlotInfo);
|
|
SCOPED(PK11SymKey);
|
|
SCOPED(PRFileDesc);
|
|
SCOPED(SECAlgorithmID);
|
|
SCOPED(SECItem);
|
|
SCOPED(SECKEYPublicKey);
|
|
SCOPED(SECKEYPrivateKey);
|
|
SCOPED(SECKEYPrivateKeyList);
|
|
SCOPED(PK11URI);
|
|
SCOPED(PLArenaPool);
|
|
SCOPED(PK11Context);
|
|
SCOPED(PK11GenericObject);
|
|
SCOPED(SSLResumptionTokenInfo);
|
|
SCOPED(SEC_PKCS12DecoderContext);
|
|
SCOPED(CERTDistNames);
|
|
|
|
#undef SCOPED
|
|
|
|
#endif // scoped_ptrs_h__
|