Changeset 549

Timestamp:

03/23/07 17:55:13 (2 years ago)

Author:

sacha

Message:

variable was not initialized and hence caused a segmentation fault on 32bit.
the variable was actually not even used and is now removed.

Files:

• trunk/src-c/xmldsig-signing-ebXML-user-message/hefeweizen_sign_ebXML_user_message.c (modified) (8 diffs)
• trunk/src-c/xmldsig-validate-signature-ebXML-user-message/hefeweizen_validate_signature_ebXML_user_message.c (modified) (6 diffs)

trunk/src-c/xmldsig-signing-ebXML-user-message/hefeweizen_sign_ebXML_user_message.c

@@ -119 +119 @@
-int replace_soap_header(const char* multipart_mime_file, xmlChar* signed_soap_mem, const char* output_file_name);
-int replace_soap_header_y(const char* multipart_mime_file, const char* temp_output_file_name, const char* output_file_name);
-int replace_soap_header_x(const char* original_multipart_mime_file, const char* signed_soap_file_name, const char* final_output_file_name);
-
-/**
@@ -150 +149 @@
-
-void* cidOpenFunction_real(const char* filename){
-
+onst c
-
-  if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "cid:", 4)) {
@@ -448 +447 @@
-  GMimePart* soap = (GMimePart*) g_mime_multipart_get_part(multipart, 0);
-  
+  fprintf(stdout, "Before strln: replace_soap_header");
-  g_mime_part_set_content(soap, (char*)signed_soap_mem, strlen(signed_soap_mem));
-  //  g_mime_multipart_set_boundary(multipart, "dddddddddddddddddddddddddd^M");
@@ -518 +518 @@
-
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-
-
-
-
-
-
+
-  g_mime_part_set_content(soap, buffer, strlen(buffer));
-
@@ -548 +543 @@
-}
-
-int replace_soap_header_x(const char* original_multipart_mime_file, const char* signed_soap_file_name, const char* final_output_file_name){
-  GMimeMessage* message;
-  int fd;
-
-  if ((fd = open (multipart_mime_file, O_RDONLY)) == -1) {
-    fprintf (stderr, "Cannot open message `%s': %s to write soap message.\n", multipart_mime_file, strerror (errno));
-    //    return -1;
-  }
-  
-  message = parse_message(fd);
-  close(fd);
-
-  GMimeObject* part = NULL;
-  part = g_mime_message_get_mime_part(message);
-  GMimeMultipart* multipart = (GMimeMultipart*) part;
-
-
-  g_mime_multipart_remove_part_at(multipart, 0);
-  
-  /* create the new part that we are going to add... */
-  GMimePart *mime_part;
-  mime_part = g_mime_part_new_with_type ("text", "xml");
-  g_mime_part_set_encoding(mime_part, GMIME_PART_ENCODING_BINARY);
-  
-
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  fprintf(stdout, "HHHHHHHHHHHHHHHELO\n");
-  
-  FILE * pFile;
-  long lSize;
-  char * buffer;
-  size_t result;
-
-  pFile = fopen ( signed_soap_file_name , "rb" );
-  if (pFile==NULL) {fputs ("File error",stderr); return (-1);}
-
-  // obtain file size:
-  fseek (pFile , 0 , SEEK_END);
-  lSize = ftell (pFile);
-  rewind (pFile);
-
-  // allocate memory to contain the whole file:
-  buffer = (char*) malloc (sizeof(char)*lSize);
-  if (buffer == NULL) {fputs ("Memory error",stderr); return (-2);}
-
-  // copy the file into the buffer:
-  result = fread (buffer,1,lSize,pFile);
-  if (result != lSize) {fputs ("Reading error",stderr); return (-3);}
-
-  /* the whole file is now loaded in the memory buffer. */
-  
-  //  fprintf(stdout, "Signed shitr: %s\n", buffer);
-
-  //  return(0);
-
-  g_mime_part_set_content (mime_part, buffer, strlen(buffer));
-
-
-  g_mime_multipart_add_part_at(multipart, mime_part, 0);
-
-  char* text;
-  text = g_mime_message_to_string (message);
-
-  FILE* output_file = NULL;
-  //  char* file_name = "/tmp/final_output_soap_file";
-  if ((output_file = fopen(final_output_file_name, "w")) == NULL)
-    fprintf(stderr, "Cannot open %s to write soap message.\n", final_output_file_name);
-  fprintf(output_file, "%s", text);
-  fclose(output_file);
-
-  g_free (text);
-  g_mime_object_unref (GMIME_OBJECT (message));
-
-  // terminate
-  fclose (pFile);
-  free (buffer);
-  return 0;
-  
-}
-
-static void 
-foreach_callback_payload(GMimeObject *part, gpointer user_data)
-{
+
-  const char* content_id = NULL;
-  int compare;
-
-
-
+
+
-  int fd2;
-
+  if (debug == 1){
+    fprintf(stdout, "Getting content id of given mime part");
+  }
-  content_id = g_mime_part_get_content_id((GMimePart *)part);
-
@@ -644 +562 @@
-    return;
-  }
+  
+  if (debug == 1)
+    fprintf(stdout, "The content id is '%s' .\n", content_id );
-
-  /* lets see if this is the required content id */
@@ -653 +574 @@
-    }
-    
-    if (debug == 1){
-      fprintf(stdout, "The file name for the mime part with id '%s' is '%s'.\n", content_id, filename );
-    }
-    //    if ((fd2 = open (filename, O_CREAT | O_WRONLY, 0666)) == -1) {
-    if ((fd2 = open (payload_message_filename, O_CREAT | O_WRONLY | O_TRUNC, 0666)) == -1) {
@@ -712 +630 @@
-    fprintf(stdout, "new filename %s\n", payload_message_filename);
-
+  //nnnnnnnnnnnnnnnnnnnnnn
+  fprintf(stdout, "Message %s", message);
-
-  g_mime_message_foreach_part (message, foreach_callback_payload, &count);

trunk/src-c/xmldsig-validate-signature-ebXML-user-message/hefeweizen_validate_signature_ebXML_user_message.c

@@ -69 +69 @@
-char* file_path;
-
-
-char* get_temp_filename();
-void set_root_path();
@@ -111 +110 @@
-
-void* cidOpenFunction_real(const char* filename){
-
+onst c
-
-  if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "cid:", 4)) {
-
+    content_id = &filename[4];
+    /*
-#if defined (_WIN32) || defined (__DJGPP__) && !defined(__CYGWIN__)
-    content_id = &filename[5];
@@ -120 +121 @@
-    content_id = &filename[4];
-#endif
+    */
-  } else 
-    content_id = filename;
@@ -529 +531 @@
-  int compare;
-  GMimeDataWrapper *content;
-  const char *filename;
-  GMimeStream *stream;
-  int fd2;
@@ -537 +538 @@
-  if (content_id == NULL) {
-    return;
+  }
+
+  if (debug == 1){
+    fprintf(stdout, "The content id is '%s'.\n", content_id );
-  }
-
@@ -547 +552 @@
-    }
-    
-    if (debug == 1){
-      fprintf(stdout, "The file name for the mime part with id '%s' is '%s'.\n", content_id, filename );
-    }
-    //    if ((fd2 = open (filename, O_CREAT | O_WRONLY, 0666)) == -1) {
-    if ((fd2 = open (payload_message_filename, O_CREAT | O_WRONLY | O_TRUNC, 0666)) == -1) {