aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2015-09-16 12:34:46 +0200
committerAnders Broman <a.broman58@gmail.com>2015-09-18 04:00:47 +0000
commit69d2d585aa5a96e6ab5b1ead049a7ee79f50060e (patch)
tree29783d547d535701f069638f9282504dd0008608 /asn1
parent7e17b58d46b9bfe1c316b5b2ba25fd59144871cb (diff)
pkcs1: remove unused RSAPrivateKey definition
RSA private keys are typically not found in network captures, so let's just remove it. This removal avoids overloading the pkcs1.modulus field with the same meaning from two different contexts (RSAPrivateKey and RSAPublicKey). Change-Id: I65239718e6fc801fc53fa46c467dc86620aa3b29 Reviewed-on: https://code.wireshark.org/review/10546 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
-rw-r--r--asn1/pkcs1/PKIXAlgs-2009.asn14
-rw-r--r--asn1/pkcs1/pkcs1.cnf1
2 files changed, 0 insertions, 15 deletions
diff --git a/asn1/pkcs1/PKIXAlgs-2009.asn b/asn1/pkcs1/PKIXAlgs-2009.asn
index 3bfaf49be1..910a674f17 100644
--- a/asn1/pkcs1/PKIXAlgs-2009.asn
+++ b/asn1/pkcs1/PKIXAlgs-2009.asn
@@ -111,20 +111,6 @@ PKIXAlgs-2009 { iso(1) identified-organization(3) dod(6)
-- Wireshark additions to ensure compatibility with the original PKCS1.asn
-RSAPrivateKey ::= SEQUENCE {
- version Version,
- modulus INTEGER, -- n
- publicExponent INTEGER, -- e
- privateExponent INTEGER, -- d
- prime1 INTEGER, -- p
- prime2 INTEGER, -- q
- exponent1 INTEGER, -- d mod (p-1)
- exponent2 INTEGER, -- d mod (q-1)
- coefficient INTEGER -- (inverse of q) mod p
-}
-
-Version ::= INTEGER
-
DigestInfo ::= SEQUENCE {
digestAlgorithm DigestAlgorithmIdentifier,
digest Digest
diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf
index 1a66217dec..8990fe7e79 100644
--- a/asn1/pkcs1/pkcs1.cnf
+++ b/asn1/pkcs1/pkcs1.cnf
@@ -5,7 +5,6 @@
#.EXPORTS
-RSAPrivateKey
RSAPublicKey
DigestInfo