Merge branch 'master' of ssh://gnunet.org/gnunet

6 files changed, 134 insertions, 95 deletions

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index df501fbcd..ce9bd6e46 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -1344,14 +1344,15 @@ GNUNET_h2s_full (const struct GNUNET_HashCode * hc)
 const char *
 GNUNET_i2s (const struct GNUNET_PeerIdentity *pid)
 {
-  static char buf[256];
+  static char buf[5];
   char *ret;
 
   if (NULL == pid)
     return "NULL";
   ret = GNUNET_CRYPTO_eddsa_public_key_to_string (&pid->public_key);
-  strcpy (buf,
-          ret);
+  strncpy (buf,
+           ret,
+           sizeof (buf) - 1);
   GNUNET_free (ret);
   buf[4] = '\0';
   return buf;
@@ -1372,14 +1373,15 @@ GNUNET_i2s (const struct GNUNET_PeerIdentity *pid)
 const char *
 GNUNET_i2s2 (const struct GNUNET_PeerIdentity *pid)
 {
-  static char buf[256];
+  static char buf[5];
   char *ret;
 
   if (NULL == pid)
     return "NULL";
   ret = GNUNET_CRYPTO_eddsa_public_key_to_string (&pid->public_key);
-  strcpy (buf,
-          ret);
+  strncpy (buf,
+           ret,
+           sizeof (buf) - 1);
   GNUNET_free (ret);
   buf[4] = '\0';
   return buf;
diff --git a/src/util/crypto_bug.c b/src/util/crypto_bug.c
index c25e79c63..1c3e9225e 100644
--- a/src/util/crypto_bug.c
+++ b/src/util/crypto_bug.c
@@ -28,7 +28,7 @@
  * Enable work-around.  Will cause code to call #check_eddsa_key() to
  * see if we have a bad key, and if so, create a new one.
  */
-#define CRYPTO_BUG 1
+#define CRYPTO_BUG 0
 
 
 #if CRYPTO_BUG
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 1abf0fddc..8d9091b23 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -1281,6 +1281,16 @@ eddsa_d_to_a (gcry_mpi_t d)
                  gcry_mpi_print (GCRYMPI_FMT_USG,
                                  rawmpi, rawmpilen, &rawmpilen,
                                  d));
+  if (rawmpilen < 32)
+  {
+    memmove (rawmpi + 32 - rawmpilen,
+             rawmpi,
+             rawmpilen);
+    memset (rawmpi,
+            0,
+            32 - rawmpilen);
+    rawmpilen = 32;
+  }
   hvec[0].data = digest;
   hvec[0].off = 0;
   hvec[0].len = b > rawmpilen ? (b - rawmpilen) : 0;
diff --git a/src/util/gnunet-qr.py.in b/src/util/gnunet-qr.py.in
index 549ce5af1..a5918fdf8 100755
--- a/src/util/gnunet-qr.py.in
+++ b/src/util/gnunet-qr.py.in
@@ -4,105 +4,106 @@ import getopt
 import subprocess
 from sys import argv
 try:
-        import zbar
+    import zbar
 except ImportError as e:
-        print('Cannot run gnunet-qr, please install zbar-python')
-        sys.exit (1)
+    print('Cannot run gnunet-qr, please install zbar-python')
+    sys.exit(1)
 
-def help ():
- print('gnunet-qr\n\
+
+def help():
+    print('gnunet-qr\n\
 Scan a QR code using a video device and import\n\
 Arguments mandatory for long options are also mandatory for short options.\n\
   -c, --config=FILENAME      use configuration file FILENAME\n\
   -d, --device=DEVICE        use device DEVICE\n\
   -s, --silent               do not show preview windows\n\
   -h, --help                 print this help\n\
-  -v, --verbose                                                  be verbose\n\
+  -v, --verbose              be verbose\n\
 Report bugs to gnunet-developers@gnu.org.\n\
 GNUnet home page: http://www.gnu.org/software/gnunet/\n\
 General help using GNU software: http://www.gnu.org/gethelp/')
 
 
 if __name__ == '__main__':
-        configuration = ''
-        device = '/dev/video0'
-        url = ''
-        verbose = False 
-        silent = False
-        # Parse arguments
-        try:
-                opts, args = getopt.gnu_getopt(sys.argv[1:], "c:hd:sv", ["config","help", "device","silent","verbose"])
-        except getopt.GetoptError as e:
-                help ()
-                print(str (e))
-                exit (1)
-        for o,a in opts:
-                if o in ("-h", "--help"):
-                        help ()            
-                        sys.exit (0)
-                elif o in ("-c", "--config"):
-                        configuration = a
-                elif o in ("-d", "--device"):
-                        device = a
-                elif o in ("-s", "--silent"):
-                        silent = True
-                elif o in ("-v", "--verbose"):
-                        verbose = True                  
-        if (True == verbose):
-                print('Initializing')
-        # create a Processor
-        proc = zbar.Processor()
+        configuration = ''
+        device = '/dev/video0'
+        url = ''
+        verbose = False
+        silent = False
+        # Parse arguments
+        try:
+                opts, args = getopt.gnu_getopt(sys.argv[1:], "c:hd:sv", ["config", "help", "device", "silent", "verbose"])
+        except getopt.GetoptError as e:
+                help()
+                print(str(e))
+                exit(1)
+        for o, a in opts:
+                if o in ("-h", "--help"):
+                        help()
+                        sys.exit(0)
+                elif o in ("-c", "--config"):
+                        configuration = a
+                elif o in ("-d", "--device"):
+                        device = a
+                elif o in ("-s", "--silent"):
+                        silent = True
+                elif o in ("-v", "--verbose"):
+                        verbose = True
+        if (True == verbose):
+                print('Initializing')
+        # create a Processor
+        proc = zbar.Processor()
+
+        # configure the Processor
+        proc.parse_config('enable')
+
+        # initialize the Processor
+        try:
+                if (True == verbose):
+                        print('Opening video device ' + device)
+                proc.init(device)
+        except Exception as e:
+                print('Failed to open device ' + device)
+                exit(1)
+
+        # enable the preview window
+        # if (True == silent):
+        #       proc.visible = True
+        # else:
+        #               proc.visible = False
+
+        proc.visible = True
+        # read at least one barcode (or until window closed)
+        try:
+                if (True == verbose):
+                        print('Capturing')
+                proc.process_one()
+        except Exception as e:
+                # Window was closed without finding code
+                exit(1)
 
-        # configure the Processor
-        proc.parse_config('enable')
+        # hide the preview window
+        proc.visible = False
 
-        # initialize the Processor
-        try:
-                if (True == verbose):
-                        print('Opening video device ' + device)
-                proc.init(device)
-        except Exception as e:
-                print('Failed to open device ' + device)
-                exit (1)
-        
-        # enable the preview window
-        #if (True == silent):
-        #       proc.visible = True
-        #else:
-        #               proc.visible = False
-        
-        proc.visible = True
-        # read at least one barcode (or until window closed)
-        try:
-                if (True == verbose):
-                        print('Capturing')
-                proc.process_one()
-        except Exception as e:
-                # Window was closed without finding code
-                exit (1)
-        
-        # hide the preview window
-        proc.visible = False
-        
-        # extract results
-        for symbol in proc.results:
-                # do something useful with results
-                if (True == verbose):
-                        print('Found ', symbol.type, ' symbol ', '"%s"' % symbol.data)
-                args = list()
-                args.append("gnunet-uri")
-                if (configuration != ''):
-                        args.append (str("-c " + str(configuration)))
-                args.append (str(symbol.data))
-                cmd = ''
-                for a in args:
-                        cmd += " " + str(a)
-                if (verbose):
-                        print('Running `' + cmd +'`')
-                res=subprocess.call(args)
-                if (0 != res):
-                        print('Failed to add URI ' + str(symbol.data))
-                else: 
-                        print('Added URI ' + str(symbol.data))
-                exit (res)
-        exit (1)
+        # extract results
+        for symbol in proc.results:
+                # do something useful with results
+                if (True == verbose):
+                        print('Found ', symbol.type, ' symbol ', '"%s"' % symbol.data)
+                args = list()
+                args.append("gnunet-uri")
+                if (configuration != ''):
+                        args.append(str("-c " + str(configuration)))
+                args.append(str(symbol.data))
+                cmd = ''
+                for a in args:
+                        cmd += " " + str(a)
+                if (verbose):
+                        print('Running `' + cmd +'`')
+                res=subprocess.call(args)
+                if (0 != res):
+                        print('Failed to add URI ' + str(symbol.data))
+                else:
+                        print('Added URI ' + str(symbol.data))
+                exit(res)
+        exit(1)
diff --git a/src/util/mq.c b/src/util/mq.c
index dbcce704d..81a42e0c6 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -1071,6 +1071,32 @@ GNUNET_MQ_set_options (struct GNUNET_MQ_Handle *mq,
 
 
 /**
+ * Obtain message contained in envelope.
+ *
+ * @param env the envelope
+ * @return message contained in the envelope
+ */
+const struct GNUNET_MessageHeader *
+GNUNET_MQ_env_get_msg (const struct GNUNET_MQ_Envelope *env)
+{
+  return env->mh;
+}
+
+
+/**
+ * Return next envelope in queue.
+ *
+ * @param env a queued envelope
+ * @return next one, or NULL
+ */
+const struct GNUNET_MQ_Envelope *
+GNUNET_MQ_env_next (const struct GNUNET_MQ_Envelope *env)
+{
+  return env->next;
+}
+
+
+/**
  * Register function to be called whenever @a mq is being
  * destroyed.
  *
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 68f02587a..21f902578 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -515,8 +515,8 @@ handle_response (void *cls,
       if ( (NULL != rh->addr_callback) &&
            (GNUNET_SYSERR != rh->was_transmitted) )
           rh->addr_callback (rh->cls,
-                           NULL,
-                           0);
+                             NULL,
+                             0);
     }
     rh->was_transmitted = GNUNET_NO;
     GNUNET_RESOLVER_request_cancel (rh);