summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Taubert ttaubert <Tim Taubert ttaubert@mozilla.com>2016-01-16 08:43:34 -0800
committerTim Taubert ttaubert <Tim Taubert ttaubert@mozilla.com>2016-01-16 08:43:34 -0800
commit4e1f105f08c62199e04ff940c4eac52d0fceaac3 (patch)
tree111f03aece75efb5cc6967aa942a62ef65679065
parent5f187d88f3e0fae98cc4c1a2d294e055b569a148 (diff)
downloadnss-hg-4e1f105f08c62199e04ff940c4eac52d0fceaac3.tar.gz
Bug 1240012 - Wrong OID value for id-aes256-GCM, r=rrelya
-rw-r--r--lib/util/secoid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util/secoid.c b/lib/util/secoid.c
index 1b977694f..71fd24cf3 100644
--- a/lib/util/secoid.c
+++ b/lib/util/secoid.c
@@ -467,7 +467,7 @@ CONST_OID dhPublicKey[] = { ANSI_X942_ALGORITHM, 0x1 };
CONST_OID idea_CBC[] = { ASCOM_IDEA_ALG, 2 };
CONST_OID aes128_GCM[] = { AES, 0x6 };
CONST_OID aes192_GCM[] = { AES, 0x1a };
-CONST_OID aes256_GCM[] = { AES, 0x23 };
+CONST_OID aes256_GCM[] = { AES, 0x2e };
CONST_OID aes128_ECB[] = { AES, 1 };
CONST_OID aes128_CBC[] = { AES, 2 };
#ifdef DEFINE_ALL_AES_CIPHERS