xtreemos

Index: openssl/crypto/asn1/asn1.hRCS File: /v/openssl/cvs/openssl/crypto/asn1/asn1.h,vrcsdiff -q -kk '-r1.128.2.11' '-r1.128.2.12' -u '/v/openssl/cvs/openssl/crypto/asn1/asn1.h,v' 2>/dev/null--- asn1.h	2009/01/28 12:35:10	1.128.2.11+++ asn1.h	2009/03/25 10:35:57	1.128.2.12@@ -1218,6 +1218,7 @@ #define ASN1_R_BAD_OBJECT_HEADER			 102 #define ASN1_R_BAD_PASSWORD_READ			 103 #define ASN1_R_BAD_TAG					 104+#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 210 #define ASN1_R_BN_LIB					 105 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106 #define ASN1_R_BUFFER_TOO_SMALL				 107@@ -1307,6 +1308,7 @@ #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157 #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158 #define ASN1_R_UNEXPECTED_EOC				 159+#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 211 #define ASN1_R_UNKNOWN_FORMAT				 160 #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161 #define ASN1_R_UNKNOWN_OBJECT_TYPE			 162Index: openssl/crypto/asn1/asn1_err.cRCS File: /v/openssl/cvs/openssl/crypto/asn1/asn1_err.c,vrcsdiff -q -kk '-r1.54.2.4' '-r1.54.2.5' -u '/v/openssl/cvs/openssl/crypto/asn1/asn1_err.c,v' 2>/dev/null--- asn1_err.c	2008/04/03 23:03:43	1.54.2.4+++ asn1_err.c	2009/03/25 10:35:57	1.54.2.5@@ -195,6 +195,7 @@ {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER)    ,"bad object header"}, {ERR_REASON(ASN1_R_BAD_PASSWORD_READ)    ,"bad password read"}, {ERR_REASON(ASN1_R_BAD_TAG)              ,"bad tag"},+{ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH),"bmpstring is wrong length"}, {ERR_REASON(ASN1_R_BN_LIB)               ,"bn lib"}, {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH),"boolean is wrong length"}, {ERR_REASON(ASN1_R_BUFFER_TOO_SMALL)     ,"buffer too small"},@@ -284,6 +285,7 @@ {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY),"unable to decode rsa key"}, {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY),"unable to decode rsa private key"}, {ERR_REASON(ASN1_R_UNEXPECTED_EOC)       ,"unexpected eoc"},+{ERR_REASON(ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),"universalstring is wrong length"}, {ERR_REASON(ASN1_R_UNKNOWN_FORMAT)       ,"unknown format"}, {ERR_REASON(ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),"unknown message digest algorithm"}, {ERR_REASON(ASN1_R_UNKNOWN_OBJECT_TYPE)  ,"unknown object type"},Index: openssl/crypto/asn1/tasn_dec.cRCS File: /v/openssl/cvs/openssl/crypto/asn1/tasn_dec.c,vrcsdiff -q -kk '-r1.26.2.10' '-r1.26.2.11' -u '/v/openssl/cvs/openssl/crypto/asn1/tasn_dec.c,v' 2>/dev/null--- tasn_dec.c	2009/03/14 18:33:25	1.26.2.10+++ tasn_dec.c	2009/03/25 10:35:57	1.26.2.11@@ -1012,6 +1012,18 @@ 		case V_ASN1_SET: 		case V_ASN1_SEQUENCE: 		default:+		if (utype == V_ASN1_BMPSTRING && (len & 1))+			{+			ASN1err(ASN1_F_ASN1_EX_C2I,+					ASN1_R_BMPSTRING_IS_WRONG_LENGTH);+			goto err;+			}+		if (utype == V_ASN1_UNIVERSALSTRING && (len & 3))+			{+			ASN1err(ASN1_F_ASN1_EX_C2I,+					ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH);+			goto err;+			} 		/* All based on ASN1_STRING and handled the same */ 		if (!*pval) 			{