diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-06 15:14:54 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-06 15:14:54 +0100 |
| commit | cc6a935ce54b573c1efd7533aff00e7bf0a9959c (patch) | |
| tree | c8ad266edb7ea1e7b93aaaaa98847cf662373668 /security/nss/lib/util/secoidt.h | |
| parent | d129c900c9f943adb69c1fb20ba1a029fdd95cff (diff) | |
| parent | 9f4afc2552a67cc675b8b8af2ecb8ebc04a473a7 (diff) | |
| download | UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.gz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.lz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.xz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/feeds/FeedWriter.js
# application/palemoon/config/version.txt
# security/manager/ssl/nsSTSPreloadList.errors
# security/manager/ssl/nsSTSPreloadList.inc
Diffstat (limited to 'security/nss/lib/util/secoidt.h')
| -rw-r--r-- | security/nss/lib/util/secoidt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/nss/lib/util/secoidt.h b/security/nss/lib/util/secoidt.h index 0a40f29fd..c77aeb19f 100644 --- a/security/nss/lib/util/secoidt.h +++ b/security/nss/lib/util/secoidt.h @@ -494,6 +494,11 @@ typedef enum { SEC_OID_TLS13_KEA_ANY = 356, + SEC_OID_X509_ANY_EXT_KEY_USAGE = 357, + SEC_OID_EXT_KEY_USAGE_IPSEC_IKE = 358, + SEC_OID_IPSEC_IKE_END = 359, + SEC_OID_IPSEC_IKE_INTERMEDIATE = 360, + SEC_OID_TOTAL } SECOidTag; |