Single byte serials

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index c301bb8..49a70b9 100644 (file)
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,8 @@
+* Fri Oct 29 2010 Andrew McNab <Andrew.McNab@cern.ch>
+- Include patch from Daniel Kouril <kouril@ics.muni.cz>
+  to support single-byte certificate serial numbers
+* Fri Oct 29 2010 Andrew McNab <Andrew.McNab@cern.ch>
+- ==== GridSite version 1.5.20 ====
 * Thu Sep 16 2010 Andrew McNab <Andrew.McNab@cern.ch>
 - Support hashes other than MD5 for VOMS ACs to
   address Bug #72185

diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index ab1d21f..233b8a8 100644 (file)
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.5
-PATCH_VERSION=1.5.19
-DEFVERSION=010519
+PATCH_VERSION=1.5.20
+DEFVERSION=010520
 VERSION=$(PATCH_VERSION)

diff --git a/org.gridsite.core/src/grst_x509.c b/org.gridsite.core/src/grst_x509.c
index 97ead66..9eb1b8a 100644 (file)
--- a/org.gridsite.core/src/grst_x509.c
+++ b/org.gridsite.core/src/grst_x509.c
@@ -665,7 +665,9 @@ static int GRSTx509ChainVomsAdd(GRSTx509Cert **grst_cert,
           {
             p = &asn1string[taglist[itag].start+taglist[itag].headerlength];
           
-            if (taglist[itag].length == 2)
+            if (taglist[itag].length == 1)
+             acissuerserial = p[0];
+            else if (taglist[itag].length == 2)
              acissuerserial = p[1] + p[0] * 0x100;
             else if (taglist[itag].length == 3)
              acissuerserial = p[2] + p[1] * 0x100 + p[0] * 0x10000;