CVS shishi/lib

[shishi-commit]

Update of /home/cvs/shishi/lib
In directory dopio:/tmp/cvs-serv3719

Modified Files:
        shishi.h.in aprep.c ap.c 
Log Message:
(shishi_aprep_enc_part_make): Don't create new EncAPRepPart, use existing.


--- /home/cvs/shishi/lib/shishi.h.in    2004/09/17 16:51:49     1.255
+++ /home/cvs/shishi/lib/shishi.h.in    2004/10/14 20:28:13     1.256
@@ -1943,6 +1943,7 @@
                                      Shishi_asn1 encticketpart,
                                      Shishi_asn1 encapreppart);
 extern int shishi_aprep_enc_part_make (Shishi * handle, Shishi_asn1 aprep,
+                                      Shishi_asn1 encapreppart,
                                       Shishi_asn1 authenticator,
                                       Shishi_asn1 encticketpart);
 extern int shishi_aprep_get_enc_part_etype (Shishi * handle,
--- /home/cvs/shishi/lib/aprep.c        2004/09/10 10:00:00     1.40
+++ /home/cvs/shishi/lib/aprep.c        2004/10/14 20:28:13     1.41
@@ -325,20 +325,12 @@
 int
 shishi_aprep_enc_part_make (Shishi * handle,
                            Shishi_asn1 aprep,
+                           Shishi_asn1 encapreppart,
                            Shishi_asn1 authenticator,
                            Shishi_asn1 encticketpart)
 {
-  Shishi_asn1 encapreppart = NULL;
   int res;
 
-  encapreppart = shishi_encapreppart (handle);
-  if (encapreppart == NULL)
-    {
-      shishi_error_printf (handle, "Could not create EncAPRepPart: %s\n",
-                          shishi_error (handle));
-      return SHISHI_ASN1_ERROR;
-    }
-
   res = shishi_encapreppart_time_copy (handle, encapreppart, authenticator);
   if (res != SHISHI_OK)
     {
--- /home/cvs/shishi/lib/ap.c   2004/10/05 18:54:42     1.69
+++ /home/cvs/shishi/lib/ap.c   2004/10/14 20:28:13     1.70
@@ -1143,7 +1143,8 @@
     printf ("Building AP-REP...\n");
 
   aprep = shishi_aprep (ap->handle);
-  rc = shishi_aprep_enc_part_make (ap->handle, aprep, ap->authenticator,
+  rc = shishi_aprep_enc_part_make (ap->handle, aprep, ap->encapreppart,
+                                  ap->authenticator,
                                   shishi_tkt_encticketpart (ap->tkt));
   if (rc != SHISHI_OK)
     {