[OpenPGP:SDK svn] r490 - openpgpsdk/trunk/src/advanced

[Subversion]

Author: rachel
Date: 2007-08-20 17:24:30 +0100 (Mon, 20 Aug 2007)
New Revision: 490

Modified:
   openpgpsdk/trunk/src/advanced/adv_create.c
   openpgpsdk/trunk/src/advanced/adv_crypto.c
   openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c
   openpgpsdk/trunk/src/advanced/adv_packet-parse.c
Log:
Comment out debugging code


Modified: openpgpsdk/trunk/src/advanced/adv_create.c
===================================================================
--- openpgpsdk/trunk/src/advanced/adv_create.c	2007-08-20 16:19:16 UTC (rev 489)
+++ openpgpsdk/trunk/src/advanced/adv_create.c	2007-08-20 16:24:30 UTC (rev 490)
@@ -765,11 +765,12 @@
         }
     checksum = checksum % 65536;
 
-    fprintf(stderr,"\nm buf checksum: ");
     cs[0]=checksum >> 8;
-    fprintf(stderr," %2x",cs[0]);
     cs[1]=checksum & 0xFF;
-    fprintf(stderr," %2x\n",cs[1]);
+
+    //    fprintf(stderr,"\nm buf checksum: ");
+    //    fprintf(stderr," %2x",cs[0]);
+    //    fprintf(stderr," %2x\n",cs[1]);
     }    
 
 static void create_unencoded_m_buf(ops_pk_session_key_t *session_key, unsigned char *m_buf)

Modified: openpgpsdk/trunk/src/advanced/adv_crypto.c
===================================================================
--- openpgpsdk/trunk/src/advanced/adv_crypto.c	2007-08-20 16:19:16 UTC (rev 489)
+++ openpgpsdk/trunk/src/advanced/adv_crypto.c	2007-08-20 16:24:30 UTC (rev 490)
@@ -22,27 +22,33 @@
 
     assert(skey->public_key.algorithm == OPS_PKA_RSA);
 
+    /*
     fprintf(stderr,"\nDECRYPTING\n");
     fprintf(stderr,"encrypted data     : ");
     for (i=0; i<16; i++)
         fprintf(stderr,"%2x ", encmpibuf[i]);
     fprintf(stderr,"\n");
+    */
 
     n=ops_rsa_private_decrypt(mpibuf,encmpibuf,(BN_num_bits(encmpi)+7)/8,
 			      &skey->key.rsa,&skey->public_key.key.rsa);
     assert(n!=-1);
 
+    /*
     fprintf(stderr,"decrypted encoded m buf     : ");
     for (i=0; i<16; i++)
         fprintf(stderr,"%2x ", mpibuf[i]);
     fprintf(stderr,"\n");
+    */
 
     if(n <= 0)
 	return -1;
 
+    /*
     printf(" decrypted=%d ",n);
     hexdump(mpibuf,n);
     printf("\n");
+    */
 
     // Decode EME-PKCS1_V1_5 (RFC 2437).
 
@@ -63,11 +69,13 @@
     if((unsigned)(n-i) <= buflen)
         memcpy(buf,mpibuf+i,n-i);
 
+    /*
     printf("decoded m buf:\n");
     int j;
     for (j=0; j<n-i; j++)
         printf("%2x ",buf[j]);
     printf("\n");
+    */
 
     return n-i;
     }

Modified: openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c
===================================================================
--- openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c	2007-08-20 16:19:16 UTC (rev 489)
+++ openpgpsdk/trunk/src/advanced/adv_openssl_crypto.c	2007-08-20 16:24:30 UTC (rev 490)
@@ -167,7 +167,7 @@
 
     n=RSA_private_decrypt(length,in,out,orsa,RSA_NO_PADDING);
 
-    printf("ops_rsa_private_decrypt: n=%d\n",n);
+    //    printf("ops_rsa_private_decrypt: n=%d\n",n);
 
     char errbuf[1024];
     errbuf[0]='\0';

Modified: openpgpsdk/trunk/src/advanced/adv_packet-parse.c
===================================================================
--- openpgpsdk/trunk/src/advanced/adv_packet-parse.c	2007-08-20 16:19:16 UTC (rev 489)
+++ openpgpsdk/trunk/src/advanced/adv_packet-parse.c	2007-08-20 16:24:30 UTC (rev 490)
@@ -2201,12 +2201,14 @@
 		     sizeof C.pk_session_key.key_id,region,pinfo))
 	return 0;
 
+    /*
     int i;
     int x=sizeof C.pk_session_key.key_id;
     printf("session key: public key id: x=%d\n",x);
     for (i=0; i<x; i++)
         printf("%2x ", C.pk_session_key.key_id[i]);
     printf("\n");
+    */
 
     if(!limited_read(c,1,region,pinfo))
 	return 0;
@@ -2283,14 +2285,16 @@
 
     memcpy(C.pk_session_key.key,unencoded_m_buf+1,k);
 
+    /*
     printf("session key recovered (len=%d):\n",k);
     unsigned int j;
     for(j=0; j<k; j++)
         printf("%2x ", C.pk_session_key.key[j]);
     printf("\n");
+    */
 
     C.pk_session_key.checksum=unencoded_m_buf[k+1]+(unencoded_m_buf[k+2] << 8);
-    printf("session key checksum: %2x %2x\n", unencoded_m_buf[k+1], unencoded_m_buf[k+2]);
+    //    printf("session key checksum: %2x %2x\n", unencoded_m_buf[k+1], unencoded_m_buf[k+2]);
 
     // Check checksum