From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 13 Sep 2004 22:33:56 +0000 (+0000)
Subject: Change values of MBSTRING_* to the form MBSTRING_FLAG|nbyte as assumed
X-Git-Tag: BEN_FIPS_TEST_6~14^2~76
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bd9327baa9345d89cbb543b2f34a54f994e4c252;p=oweals%2Fopenssl.git

Change values of MBSTRING_* to the form MBSTRING_FLAG|nbyte as assumed
in ASN1_STRING_to_UTF8().
---

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index f7bb935e07..0df0f47621 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -152,10 +152,10 @@ extern "C" {
 
 /* For use with ASN1_mbstring_copy() */
 #define MBSTRING_FLAG		0x1000
+#define MBSTRING_UTF8		(MBSTRING_FLAG)
 #define MBSTRING_ASC		(MBSTRING_FLAG|1)
 #define MBSTRING_BMP		(MBSTRING_FLAG|2)
-#define MBSTRING_UNIV		(MBSTRING_FLAG|3)
-#define MBSTRING_UTF8		(MBSTRING_FLAG|4)
+#define MBSTRING_UNIV		(MBSTRING_FLAG|4)
 
 struct X509_algor_st;