Cleanup

svn path=/openssl/trunk/crypto/x509v3/v3_asid.c; revision=26

2 files changed, 6 insertions, 8 deletions

diff --git a/openssl/trunk/crypto/x509v3/v3_asid.c b/openssl/trunk/crypto/x509v3/v3_asid.c
index 2a575e2a..c1114465 100644
--- a/openssl/trunk/crypto/x509v3/v3_asid.c
+++ b/openssl/trunk/crypto/x509v3/v3_asid.c
@@ -30,26 +30,24 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 
-/* RFC 3779 AS ID */
-
 ASN1_SEQUENCE(ASRange) = {
   ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
   ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(ASRange)
 
 ASN1_CHOICE(ASIdOrRange) = {
-  ASN1_SIMPLE(ASIdOrRange, u.id, ASN1_INTEGER),
+  ASN1_SIMPLE(ASIdOrRange, u.id,    ASN1_INTEGER),
   ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
 } ASN1_CHOICE_END(ASIdOrRange)
 
 ASN1_CHOICE(ASIdentiferChoice) = {
-  ASN1_IMP(ASIdentiferChoice, u.inherit, ASN1_NULL),
-  ASN1_IMP_SEQUENCE_OF(ASIdentiferChoice, u.asIdsOrRanges, ASIdOrRange)
+  ASN1_SIMPLE(ASIdentiferChoice,      u.inherit,       ASN1_NULL),
+  ASN1_SEQUENCE_OF(ASIdentiferChoice, u.asIdsOrRanges, ASIdOrRange)
 } ASN1_CHOICE_END(ASIdentiferChoice)
 
 ASN1_SEQUENCE(ASIdentifiers) = {
   ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentiferChoice, 0),
-  ASN1_EXP_OPT(ASIdentifiers, rdi, ASIdentiferChoice, 1)
+  ASN1_EXP_OPT(ASIdentifiers, rdi,   ASIdentiferChoice, 1)
 } ASN1_SEQUENCE_END(ASIdentifiers)
 
 IMPLEMENT_ASN1_FUNCTIONS(ASRange)
diff --git a/openssl/trunk/crypto/x509v3/v3_asid.h b/openssl/trunk/crypto/x509v3/v3_asid.h
index 01891c93..2a409175 100644
--- a/openssl/trunk/crypto/x509v3/v3_asid.h
+++ b/openssl/trunk/crypto/x509v3/v3_asid.h
@@ -40,7 +40,7 @@ typedef struct ASIdOrRange_st {
   int type;
   union {
     ASN1_INTEGER *id;
-    ASRange *range;
+    ASRange      *range;
   } u;
 } ASIdOrRange;
 
@@ -53,7 +53,7 @@ DECLARE_STACK_OF(ASIdOrRange)
 typedef struct ASIdentifierChoice_st {
   int type;
   union {
-    ASN1_NULL *inherit;
+    ASN1_NULL    *inherit;
     ASIdOrRanges *asIdsOrRanges;
   } u;
 } ASIdentifierChoice;