CVS shishi/lib

[shishi-commit]

Update of /home/jas/self/public-cvs/shishi/lib
In directory latte:/home/jas/self/src/shishi/lib

Modified Files:
        shishi.h.in diskio.c asn1.c 
Log Message:
Add PA/METHOD-DATA stuff.


--- /home/jas/self/public-cvs/shishi/lib/shishi.h.in    2006/03/30 12:53:42     
1.265
+++ /home/jas/self/public-cvs/shishi/lib/shishi.h.in    2006/03/30 13:10:48     
1.266
@@ -1593,6 +1593,7 @@
 extern void shishi_asn1_done (Shishi * handle, Shishi_asn1 node);
 
 extern Shishi_asn1 shishi_asn1_padata (Shishi * handle);
+extern Shishi_asn1 shishi_asn1_methoddata (Shishi * handle);
 extern Shishi_asn1 shishi_asn1_asreq (Shishi * handle);
 extern Shishi_asn1 shishi_asn1_asrep (Shishi * handle);
 extern Shishi_asn1 shishi_asn1_tgsreq (Shishi * handle);
@@ -1621,6 +1622,10 @@
 
 extern Shishi_asn1 shishi_der2asn1 (Shishi * handle,
                                    const char *der, size_t derlen);
+extern Shishi_asn1 shishi_der2asn1_padata (Shishi * handle,
+                                          const char *der, size_t derlen);
+extern Shishi_asn1 shishi_der2asn1_methoddata (Shishi * handle,
+                                              const char *der, size_t derlen);
 extern Shishi_asn1 shishi_der2asn1_ticket (Shishi * handle,
                                           const char *der, size_t derlen);
 extern Shishi_asn1 shishi_der2asn1_encticketpart (Shishi * handle,
--- /home/jas/self/public-cvs/shishi/lib/diskio.c       2006/03/27 15:42:00     
1.47
+++ /home/jas/self/public-cvs/shishi/lib/diskio.c       2006/03/30 13:10:48     
1.48
@@ -102,6 +102,19 @@
 }
 
 int
+shishi_padata_print (Shishi * handle, FILE * fh, Shishi_asn1 padata)
+{
+  return _shishi_print_armored_data (handle, fh, padata, "PA-DATA", NULL);
+}
+
+int
+shishi_methoddata_print (Shishi * handle, FILE * fh, Shishi_asn1 methoddata)
+{
+  return _shishi_print_armored_data (handle, fh, methoddata,
+                                    "METHOD-DATA", NULL);
+}
+
+int
 shishi_enckdcreppart_print (Shishi * handle,
                            FILE * fh, Shishi_asn1 enckdcreppart)
 {
--- /home/jas/self/public-cvs/shishi/lib/asn1.c 2006/03/30 12:53:42     1.74
+++ /home/jas/self/public-cvs/shishi/lib/asn1.c 2006/03/30 13:10:48     1.75
@@ -439,6 +439,20 @@
 }
 
 /**
+ * shishi_asn1_methoddata:
+ * @handle: shishi handle as allocated by shishi_init().
+ *
+ * Create new ASN.1 structure for METHOD-DATA.
+ *
+ * Return value: Returns ASN.1 structure.
+ **/
+Shishi_asn1
+shishi_asn1_methoddata (Shishi * handle)
+{
+  return asn1_new (handle, ASN1NAME "METHOD-DATA", "METHOD-DATA");
+}
+
+/**
  * shishi_asn1_asreq:
  * @handle: shishi handle as allocated by shishi_init().
  *
@@ -865,6 +879,38 @@
 }
 
 /**
+ * shishi_der2asn1_padata:
+ * @handle: shishi handle as allocated by shishi_init().
+ * @der: input character array with DER encoding.
+ * @derlen: length of input character array with DER encoding.
+ *
+ * Decode DER encoding of PA-DATA and create a ASN.1 structure.
+ *
+ * Return value: Returns ASN.1 structure corresponding to DER data.
+ **/
+Shishi_asn1
+shishi_der2asn1_padata (Shishi * handle, const char *der, size_t derlen)
+{
+  return der2asn1 (handle, ASN1NAME "PA-DATA", "PA-DATA", der, derlen);
+}
+
+/**
+ * shishi_der2asn1_methoddata:
+ * @handle: shishi handle as allocated by shishi_init().
+ * @der: input character array with DER encoding.
+ * @derlen: length of input character array with DER encoding.
+ *
+ * Decode DER encoding of METHOD-DATA and create a ASN.1 structure.
+ *
+ * Return value: Returns ASN.1 structure corresponding to DER data.
+ **/
+Shishi_asn1
+shishi_der2asn1_methoddata (Shishi * handle, const char *der, size_t derlen)
+{
+  return der2asn1 (handle, ASN1NAME "METHOD-DATA", "METHOD-DATA", der, derlen);
+}
+
+/**
  * shishi_der2asn1_ticket:
  * @handle: shishi handle as allocated by shishi_init().
  * @der: input character array with DER encoding.