X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=CHANGES;h=f144af58ccb8c8bf3deb161b7a60c41d70b47973;hb=722ca2781c975a419f83b846db0f387939dfc988;hp=f7f2258bbf306fe5829a0944dbfde99231418a93;hpb=1c72eebf895712ebd79343da1fecba5ba5707fbb;p=openssl.git

diff --git a/CHANGES b/CHANGES
index f7f2258bbf..f144af58cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Rewrite CHOICE field setting in ASN1_item_ex_d2i(). The old code
+     could not support the combine flag in choice fields.
+     [Steve Henson]
+
   *) Change bctest to avoid here-documents inside command substitution
      (workaround for FreeBSD /bin/sh bug).
      [Bodo Moeller]