[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3642 - in trunk/softHSM: . src/bin

Rickard Bellgrim rickard.bellgrim at iis.se
Wed Aug 4 11:19:11 CEST 2010


Author: rb
Date: 2010-08-04 11:19:11 +0200 (Wed, 04 Aug 2010)
New Revision: 3642

Modified:
   trunk/softHSM/NEWS
   trunk/softHSM/src/bin/softhsm-keyconv.cpp
   trunk/softHSM/src/bin/softhsm-keyconv.h
Log:
Support BIND file version 1.3


Modified: trunk/softHSM/NEWS
===================================================================
--- trunk/softHSM/NEWS	2010-08-03 13:03:44 UTC (rev 3641)
+++ trunk/softHSM/NEWS	2010-08-04 09:19:11 UTC (rev 3642)
@@ -4,9 +4,11 @@
 
 SoftHSM trunk
 
-* Added mechanism CKM_RSA_X_509
+* Added mechanism CKM_RSA_X_509 (use Botan 1.9.7 to fix a bug
+  when verifying these signatures)
 * The softhsm command now have the option --module <path>
-  To use another PKCS#11 library other than SoftHSM.
+  To use a PKCS#11 library other than SoftHSM.
+* Ticket #163: softhsm-keyconv now support BIND format v1.3
 
 
 SoftHSM 1.1.4 - 2010-04-06

Modified: trunk/softHSM/src/bin/softhsm-keyconv.cpp
===================================================================
--- trunk/softHSM/src/bin/softhsm-keyconv.cpp	2010-08-03 13:03:44 UTC (rev 3641)
+++ trunk/softHSM/src/bin/softhsm-keyconv.cpp	2010-08-04 09:19:11 UTC (rev 3642)
@@ -276,7 +276,7 @@
           error = 1;
           break;
         }
-        if(m != FILE_MAJOR_VERSION || n != FILE_MINOR_VERSION) {
+        if(m > FILE_MAJOR_VERSION_MAX || (m == FILE_MAJOR_VERSION_MAX && n > FILE_MINOR_VERSION_MAX)) {
           fprintf(stderr, "Error: Cannot parse this version of file format, v%i.%i.\n", m, n);
           error = 1;
         }
@@ -370,6 +370,9 @@
       case TAG_EXP2:
       case TAG_COEFF:
       case TAG_PUBVAL:
+      case TAG_CREATED:
+      case TAG_PUBLISH:
+      case TAG_ACTIVATE:
       default:
         break;
     }

Modified: trunk/softHSM/src/bin/softhsm-keyconv.h
===================================================================
--- trunk/softHSM/src/bin/softhsm-keyconv.h	2010-08-03 13:03:44 UTC (rev 3641)
+++ trunk/softHSM/src/bin/softhsm-keyconv.h	2010-08-04 09:19:11 UTC (rev 3642)
@@ -69,7 +69,11 @@
 }
 #endif
 
-// The BIND file version number.
+// The BIND file version number support for import
+#define FILE_MAJOR_VERSION_MAX  1
+#define FILE_MINOR_VERSION_MAX  3
+
+// The BIND file version number for generated output.
 #define FILE_MAJOR_VERSION	1
 #define FILE_MINOR_VERSION	2
 
@@ -103,6 +107,9 @@
   "Public_value(y):",
   "Subprime(q):",
   "Base(g):",
+  "Created:",
+  "Publish:",
+  "Activate:",
   NULL
 };
 
@@ -123,7 +130,10 @@
   TAG_PRIVVAL,
   TAG_PUBVAL,
   TAG_SUBPRIME,
-  TAG_BASE
+  TAG_BASE,
+  TAG_CREATED,
+  TAG_PUBLISH,
+  TAG_ACTIVATE
 };
 
 #endif /* SOFTHSM_SOFTHSM_KEYCONV_H */




More information about the Opendnssec-commits mailing list