From dab8d695015acd7574c4b35217c319b13f661234 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Tue, 6 Nov 2012 16:08:09 +0100 Subject: public_key: Add PKCS-7 First attempt to add PKCS-7 does not compile --- lib/public_key/asn1/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/public_key/asn1/Makefile') diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index 4bd043ee5d..8b76d957f0 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -40,7 +40,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN) ASN_TOP = OTP-PUB-KEY PKCS-FRAME ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \ - PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-8 PKCS5v2-0 OTP-PKIX + PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-9 PKCS-15 PKCS-12 PKCS5v2-0 OTP-PKIX \ + AuthenticationFramework InformationFramework UsefulDefinitions SelectedAttributeTypes ASN_ASNS = $(ASN_MODULES:%=%.asn1) ASN_ERLS = $(ASN_TOP:%=%.erl) ASN_HRLS = $(ASN_TOP:%=%.hrl) @@ -117,4 +118,14 @@ OTP-PUB-KEY.asn1db: PKIX1Algorithms88.asn1 \ $(EBIN)/PKCS-FRAME.beam: PKCS-FRAME.erl PKCS-FRAME.hrl PKCS-FRAME.erl PKCS-FRAME.hrl: PKCS-FRAME.asn1db PKCS-FRAME.asn1db: PKCS-8.asn1\ + PKCS-7.asn1\ + PKCS-9.asn1\ + PKCS-15.asn1\ + PKCS-12.asn1\ + AuthenticationFramework.asn1\ + InformationFramework.asn1\ + UsefulDefinitions.asn1\ + SelectedAttributeTypes.asn1\ + CryptographicMessageSyntax.asn1\ + UpperBounds.asn1\ PKCS5v2-0.asn1 \ No newline at end of file -- cgit v1.2.3 From 067aef311309ad751ddeb9c40169b25c0dd1b72c Mon Sep 17 00:00:00 2001 From: Kenneth Lundin Date: Mon, 12 Nov 2012 15:54:42 +0100 Subject: public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS. The ASN-1 compiler could not handle these IMPORTS properly causing compilation errors. --- lib/public_key/asn1/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'lib/public_key/asn1/Makefile') diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index 8b76d957f0..4b4db9ec6d 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -40,7 +40,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN) ASN_TOP = OTP-PUB-KEY PKCS-FRAME ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \ - PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-9 PKCS-15 PKCS-12 PKCS5v2-0 OTP-PKIX \ + PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS5v2-0 OTP-PKIX \ AuthenticationFramework InformationFramework UsefulDefinitions SelectedAttributeTypes ASN_ASNS = $(ASN_MODULES:%=%.asn1) ASN_ERLS = $(ASN_TOP:%=%.erl) @@ -116,16 +116,11 @@ OTP-PUB-KEY.asn1db: PKIX1Algorithms88.asn1 \ OTP-PKIX.asn1 $(EBIN)/PKCS-FRAME.beam: PKCS-FRAME.erl PKCS-FRAME.hrl -PKCS-FRAME.erl PKCS-FRAME.hrl: PKCS-FRAME.asn1db -PKCS-FRAME.asn1db: PKCS-8.asn1\ +PKCS-FRAME.erl PKCS-FRAME.hrl: PKCS-FRAME.asn1db +PKCS-FRAME.asn1db: PKCS5v2-0.asn1\ + PKCS-8.asn1\ PKCS-7.asn1\ - PKCS-9.asn1\ - PKCS-15.asn1\ - PKCS-12.asn1\ AuthenticationFramework.asn1\ InformationFramework.asn1\ UsefulDefinitions.asn1\ - SelectedAttributeTypes.asn1\ - CryptographicMessageSyntax.asn1\ - UpperBounds.asn1\ - PKCS5v2-0.asn1 \ No newline at end of file + SelectedAttributeTypes.asn1 -- cgit v1.2.3 From 689b6c5bacf0d7f89c7f3de028627753ad5a1438 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Tue, 13 Nov 2012 16:19:18 +0100 Subject: public_key: Added PKCS-10 --- lib/public_key/asn1/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/public_key/asn1/Makefile') diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index 4b4db9ec6d..c8426411d3 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -40,7 +40,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN) ASN_TOP = OTP-PUB-KEY PKCS-FRAME ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \ - PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS5v2-0 OTP-PKIX \ + PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \ AuthenticationFramework InformationFramework UsefulDefinitions SelectedAttributeTypes ASN_ASNS = $(ASN_MODULES:%=%.asn1) ASN_ERLS = $(ASN_TOP:%=%.erl) @@ -120,6 +120,7 @@ PKCS-FRAME.erl PKCS-FRAME.hrl: PKCS-FRAME.asn1db PKCS-FRAME.asn1db: PKCS5v2-0.asn1\ PKCS-8.asn1\ PKCS-7.asn1\ + PKCS-10.asn1\ AuthenticationFramework.asn1\ InformationFramework.asn1\ UsefulDefinitions.asn1\ -- cgit v1.2.3 From dbf18b8a7713d76c0be307af40e97cd7c564aa53 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 15 Nov 2012 10:38:05 +0100 Subject: public_key: Simplified PKCS-7 and PKCS-10 specs. Used defenitions from PKIX1Explicit88 to avoid most of the overcomplicated InformationalFrameWork (and friends) ASN-1 specs. We want to keep the public_key API as small and simple as possible. --- lib/public_key/asn1/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/public_key/asn1/Makefile') diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index c8426411d3..957c332cad 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -41,7 +41,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN) ASN_TOP = OTP-PUB-KEY PKCS-FRAME ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \ PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \ - AuthenticationFramework InformationFramework UsefulDefinitions SelectedAttributeTypes + InformationFramework ASN_ASNS = $(ASN_MODULES:%=%.asn1) ASN_ERLS = $(ASN_TOP:%=%.erl) ASN_HRLS = $(ASN_TOP:%=%.hrl) @@ -113,15 +113,12 @@ OTP-PUB-KEY.asn1db: PKIX1Algorithms88.asn1 \ PKIXAttributeCertificate.asn1 \ PKCS-1.asn1\ PKCS-3.asn1\ + PKCS-7.asn1\ + PKCS-10.asn1\ + InformationFramework.asn1\ OTP-PKIX.asn1 $(EBIN)/PKCS-FRAME.beam: PKCS-FRAME.erl PKCS-FRAME.hrl PKCS-FRAME.erl PKCS-FRAME.hrl: PKCS-FRAME.asn1db PKCS-FRAME.asn1db: PKCS5v2-0.asn1\ PKCS-8.asn1\ - PKCS-7.asn1\ - PKCS-10.asn1\ - AuthenticationFramework.asn1\ - InformationFramework.asn1\ - UsefulDefinitions.asn1\ - SelectedAttributeTypes.asn1 -- cgit v1.2.3