s4: import lorikeet-heimdal-200810271034

metze

1 files changed, 43 insertions, 43 deletions

diff --git a/source4/heimdal/lib/asn1/parse.y b/source4/heimdal/lib/asn1/parse.y
index 956386820f..aca4a062b8 100644
--- a/source4/heimdal/lib/asn1/parse.y
+++ b/source4/heimdal/lib/asn1/parse.y
@@ -1,34 +1,34 @@
 /*
- * Copyright (c) 1997 - 2007 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
+ * Copyright (c) 1997 - 2007 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 /* $Id$ */
@@ -208,7 +208,7 @@ struct string_list {
 %type <member> NamedBit
 %type <member> NamedNumber
 %type <member> NamedType
-%type <members> ComponentTypeList 
+%type <members> ComponentTypeList
 %type <members> Enumerations
 %type <members> NamedBitList
 %type <members> NamedNumberList
@@ -267,7 +267,7 @@ SymbolsFromModuleList: SymbolsFromModule
 		;
 
 SymbolsFromModule: referencenames kw_FROM IDENTIFIER objid_opt
-		{ 
+		{
 		    struct string_list *sl;
 		    for(sl = $1; sl != NULL; sl = sl->next) {
 			Symbol *s = addsym(sl->string);
@@ -332,7 +332,7 @@ BuiltinType	: BitStringType
 
 BooleanType	: kw_BOOLEAN
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_Boolean, 
+			$$ = new_tag(ASN1_C_UNIV, UT_Boolean,
 				     TE_EXPLICIT, new_type(TBoolean));
 		}
 		;
@@ -376,7 +376,7 @@ range		: '(' Value RANGE Value ')'
 
 IntegerType	: kw_INTEGER
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_Integer, 
+			$$ = new_tag(ASN1_C_UNIV, UT_Integer,
 				     TE_EXPLICIT, new_type(TInteger));
 		}
 		| kw_INTEGER range
@@ -449,7 +449,7 @@ BitStringType	: kw_BIT kw_STRING
 
 ObjectIdentifierType: kw_OBJECT kw_IDENTIFIER
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_OID, 
+			$$ = new_tag(ASN1_C_UNIV, UT_OID,
 				     TE_EXPLICIT, new_type(TOID));
 		}
 		;
@@ -457,14 +457,14 @@ OctetStringType	: kw_OCTET kw_STRING size
 		{
 		    Type *t = new_type(TOctetString);
 		    t->range = $3;
-		    $$ = new_tag(ASN1_C_UNIV, UT_OctetString, 
+		    $$ = new_tag(ASN1_C_UNIV, UT_OctetString,
 				 TE_EXPLICIT, t);
 		}
 		;
 
 NullType	: kw_NULL
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_Null, 
+			$$ = new_tag(ASN1_C_UNIV, UT_Null,
 				     TE_EXPLICIT, new_type(TNull));
 		}
 		;
@@ -545,12 +545,12 @@ DefinedType	: IDENTIFIER
 
 UsefulType	: kw_GeneralizedTime
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_GeneralizedTime, 
+			$$ = new_tag(ASN1_C_UNIV, UT_GeneralizedTime,
 				     TE_EXPLICIT, new_type(TGeneralizedTime));
 		}
 		| kw_UTCTime
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_UTCTime, 
+			$$ = new_tag(ASN1_C_UNIV, UT_UTCTime,
 				     TE_EXPLICIT, new_type(TUTCTime));
 		}
 		;
@@ -684,37 +684,37 @@ CharacterStringType: RestrictedCharactedStringType
 
 RestrictedCharactedStringType: kw_GeneralString
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_GeneralString, 
+			$$ = new_tag(ASN1_C_UNIV, UT_GeneralString,
 				     TE_EXPLICIT, new_type(TGeneralString));
 		}
 		| kw_UTF8String
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_UTF8String, 
+			$$ = new_tag(ASN1_C_UNIV, UT_UTF8String,
 				     TE_EXPLICIT, new_type(TUTF8String));
 		}
 		| kw_PrintableString
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_PrintableString, 
+			$$ = new_tag(ASN1_C_UNIV, UT_PrintableString,
 				     TE_EXPLICIT, new_type(TPrintableString));
 		}
 		| kw_VisibleString
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_VisibleString, 
+			$$ = new_tag(ASN1_C_UNIV, UT_VisibleString,
 				     TE_EXPLICIT, new_type(TVisibleString));
 		}
 		| kw_IA5String
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_IA5String, 
+			$$ = new_tag(ASN1_C_UNIV, UT_IA5String,
 				     TE_EXPLICIT, new_type(TIA5String));
 		}
 		| kw_BMPString
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_BMPString, 
+			$$ = new_tag(ASN1_C_UNIV, UT_BMPString,
 				     TE_EXPLICIT, new_type(TBMPString));
 		}
 		| kw_UniversalString
 		{
-			$$ = new_tag(ASN1_C_UNIV, UT_UniversalString, 
+			$$ = new_tag(ASN1_C_UNIV, UT_UniversalString,
 				     TE_EXPLICIT, new_type(TUniversalString));
 		}
 
@@ -833,7 +833,7 @@ objid_element	: IDENTIFIER '(' NUMBER ')'
 		    Symbol *s = addsym($1);
 		    if(s->stype != SValue ||
 		       s->value->type != objectidentifiervalue) {
-			error_message("%s is not an object identifier\n", 
+			error_message("%s is not an object identifier\n",
 				      s->name);
 			exit(1);
 		    }
@@ -936,7 +936,7 @@ new_tag(int tagclass, int tagvalue, int tagenv, Type *oldtype)
 	oldtype = oldtype->subtype; /* XXX */
     } else
 	t = new_type (TTag);
-    
+
     t->tag.tagclass = tagclass;
     t->tag.tagvalue = tagvalue;
     t->tag.tagenv = tagenv;