[Nym3-commit] r115 - in trunk/nym3: . Client Server

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-19 11:17:05 +0200 (Thu, 19 Aug 2004)
New Revision: 115

Added:
   trunk/nym3/Client/Main.py
Modified:
   trunk/nym3/Crypto.py
   trunk/nym3/Mail.py
   trunk/nym3/Server/Main.py
   trunk/nym3/Server/User.py
Log:
- fix the module importation
- begin Client main (skeleton of process Message and main) 


Added: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2004-08-18 20:57:25 UTC (rev 114)
+++ trunk/nym3/Client/Main.py	2004-08-19 09:17:05 UTC (rev 115)
@@ -0,0 +1,39 @@
+import sys
+import os
+import getopt
+import nym3.Client.User
+import nym3.Client.Config
+import nym3.Message
+import nym3.Common
+import nym3.Mail
+
+def processMessage(msg):
+    """process incoming control message
+    """
+      
+    sr = nym3.Message.StrReader(msg)
+    comList = sr.readCommandCToSList()
+    for com in comList:
+        if (com.ct() == 0):
+            pass
+        elif (com.ct() == 1):
+            pass
+        elif (com.ct() == 2):
+           pass
+       elif (com.ct() == 3):
+           pass
+       elif (com.ct() == 4):
+           pass
+       elif (com.ct() == 5):
+           pass
+    
+if __name__ == '__main__':
+    optlist, pholder = getopt.getopt(sys.argv[1:], 'D:d:m')
+    for o, a in optlist:
+        if o == "-D":
+            nym3.Client.Config.DEBUG = True
+        
+    for o, a in optlist:
+        if o == "-m":#control message
+	    processMessage(sys.stdin.read())
+	    sys.exit(0)

Modified: trunk/nym3/Crypto.py
===================================================================
--- trunk/nym3/Crypto.py	2004-08-18 20:57:25 UTC (rev 114)
+++ trunk/nym3/Crypto.py	2004-08-19 09:17:05 UTC (rev 115)
@@ -15,8 +15,8 @@
         k = k + chr(random.randint(0, 255))
     K = _cr.Keyset(k)
     dataE = _cr.lioness_encrypt(dataP, K.getLionessKeys(""))
-    #42 : taille du padding introduit par OAEP
-    #20 : taille de k
+    #42 : size of OAEP padding(bytes)
+    #20 : size of k (bytes)
     rsaLen = n - OAEP_OVERHEAD - 20
     rsaPart = pk_encrypt(k + dataE[0:rsaLen],key)
     return rsaPart + dataEnc[rsaLen:]

Modified: trunk/nym3/Mail.py
===================================================================
--- trunk/nym3/Mail.py	2004-08-18 20:57:25 UTC (rev 114)
+++ trunk/nym3/Mail.py	2004-08-19 09:17:05 UTC (rev 115)
@@ -6,8 +6,8 @@
 import random
 import base64
 import string
-import Common
-import Config
+import nym3.Common as Common
+import nym3.Server.Config as Sconfig
 
 slen = 180
 midLen = Common.midLength
@@ -70,7 +70,7 @@
 def relay(nym,rt,ri,body):
     """relay the e-mail in body according to the routing type rt
     and the routing info ri for the nymholder of nym"""
-    b = 'From: ' + nym + '@' + Config.serverName + "\n" + body
+    b = 'From: ' + nym + '@' + Sconfig.serverName + "\n" + body
     fname = tmpFileMsg(b) #TODO we can avoid the tempfile with some fd manipultation : exec mixminion, write b in its stdin
     ec = os.system("mixminion -t 0x" + b2s(rt[1]) + b2s(rt[0]) + ":" + ri + " -i " + fname)
     os.unlink(fname)

Modified: trunk/nym3/Server/Main.py
===================================================================
--- trunk/nym3/Server/Main.py	2004-08-18 20:57:25 UTC (rev 114)
+++ trunk/nym3/Server/Main.py	2004-08-19 09:17:05 UTC (rev 115)
@@ -4,11 +4,11 @@
 import sys
 import os
 import getopt
-import nym3.Server.User
-import nym3.Server.Config
-import nym3.Message
-import nym3.Common
-import nym3.Mail
+import nym3.Server.User as User
+import nym3.Server.Config as Config
+import nym3.Message as Message
+import nym3.Common as Common
+import nym3.Mail as Mail
 
 lifeCycle = Common.lifeCycle
 
@@ -55,7 +55,7 @@
 		        #the Create command
                         for pnym in self.list:
                             try:
-                                nymUser=User.User(pnym,1)
+                                nymUser = User.User(pnym,1)
                             except User.AlreadySuchUser:
                                 pass
                             if(nymUser != None):

Modified: trunk/nym3/Server/User.py
===================================================================
--- trunk/nym3/Server/User.py	2004-08-18 20:57:25 UTC (rev 114)
+++ trunk/nym3/Server/User.py	2004-08-19 09:17:05 UTC (rev 115)
@@ -1,10 +1,10 @@
 # $Id$
 
 import os
-import nym3.Server.Config
-import nym3.Common
-import nym3.Mail
-import nym3.Crypto
+import nym3.Server.Config as Config
+import nym3.Common as Common
+import nym3.Mail as Mail
+import nym3.Crypto as Crypto
 import pickle
 import string
 import time