aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/nid.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-07-06 11:09:19 -0700
committerSteven Fackler <[email protected]>2015-07-06 11:09:19 -0700
commit114e8a5a58a8fb3c4cc37391fc2f5a7addd796fc (patch)
treed35618791cfc3bf1815b310639f74185a0d0464d /openssl/src/nid.rs
parentMerge branch 'release-v0.6.3' into release (diff)
parentRelease v0.6.4 (diff)
downloadrust-openssl-0.6.4.tar.xz
rust-openssl-0.6.4.zip
Merge branch 'release-v0.6.4' into releasev0.6.4
Diffstat (limited to 'openssl/src/nid.rs')
-rw-r--r--openssl/src/nid.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/openssl/src/nid.rs b/openssl/src/nid.rs
index 08424ae8..c5b9e277 100644
--- a/openssl/src/nid.rs
+++ b/openssl/src/nid.rs
@@ -37,6 +37,7 @@ pub enum Nid {
DES_EDE,
DES_EDE3,
IDEA_CBC,
+ IDEA_CFB,
IDEA_ECB,
RC2_CBC,
RC2_ECB,
@@ -55,6 +56,7 @@ pub enum Nid {
MessageDigest,
SigningTime,
CounterSignature,
+ ChallengePassword,
UnstructuredAddress,
ExtendedCertificateAttributes,
Netscape,
@@ -93,6 +95,7 @@ pub enum Nid {
AuthorityKeyIdentifier,
BF_CBC,
BF_ECB,
+ BF_CFB,
BF_OFB,
MDC2,
RSA_MDC2,
@@ -117,7 +120,8 @@ pub enum Nid {
RSA_SHA1_2,
DSA,
RIPEMD160,
- RSA_RIPEMD160,
+ /* 118 missing */
+ RSA_RIPEMD160=119,
RC5_CBC,
RC5_ECB,
RC5_CFB,
@@ -142,7 +146,6 @@ pub enum Nid {
CRLReason,
InvalidityDate,
SXNetID,
- Pkcs12,
PBE_SHA1_RC4_128,
PBE_SHA1_RC4_40,
PBE_SHA1_3DES,