diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/lib/util/ciferfam.h | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/lib/util/ciferfam.h')
| -rw-r--r-- | security/nss/lib/util/ciferfam.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/nss/lib/util/ciferfam.h b/security/nss/lib/util/ciferfam.h index 559e92f1d..68caa4f8b 100644 --- a/security/nss/lib/util/ciferfam.h +++ b/security/nss/lib/util/ciferfam.h @@ -52,6 +52,9 @@ #define PKCS12_RC4_128 (CIPHER_FAMILYID_PKCS12 | 0012) #define PKCS12_DES_56 (CIPHER_FAMILYID_PKCS12 | 0021) #define PKCS12_DES_EDE3_168 (CIPHER_FAMILYID_PKCS12 | 0022) +#define PKCS12_AES_CBC_128 (CIPHER_FAMILYID_PKCS12 | 0031) +#define PKCS12_AES_CBC_192 (CIPHER_FAMILYID_PKCS12 | 0032) +#define PKCS12_AES_CBC_256 (CIPHER_FAMILYID_PKCS12 | 0033) /* SMIME version numbers are negative, to avoid colliding with SSL versions */ #define SMIME_LIBRARY_VERSION_1_0 -0x0100 |