Openembedded Devel Discussions
 help / color / mirror / Atom feed
* [meta-networking][PATCH] crda: fix build issue do to missing python module
@ 2017-02-06 16:39 Armin Kuster
  2017-02-06 17:10 ` akuster808
  2017-02-07 21:54 ` [meta-networking][PATCH] crda: fix build issue do to missing python module akuster808
  0 siblings, 2 replies; 10+ messages in thread
From: Armin Kuster @ 2017-02-06 16:39 UTC (permalink / raw)
  To: openembedded-devel, joe_macdonald

this now requires python-pycrypto module to fix plus upstream patch

| ERROR: oe_runmake failed
|   GEN  keys-ssl.c
|   Trusted pubkeys: pubkeys/linville.key.pub.pem pubkeys/sforshee.key.pub.pem
| ERROR: Failed to import the "Crypto.PublicKey" module: No module named Crypto.PublicKey

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...crda-support-python-3-in-utils-key2pub.py.patch | 271 +++++++++++++++++++++
 .../recipes-connectivity/crda/crda_3.18.bb         |   3 +-
 2 files changed, 273 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch

diff --git a/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
new file mode 100644
index 0000000..d2ca92f
--- /dev/null
+++ b/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
@@ -0,0 +1,271 @@
+From 797f2836c48f9ba2446629ae4b6867ca1a5ea512 Mon Sep 17 00:00:00 2001
+From: Taahir Ahmed <ahmed.taahir@gmail.com>
+Date: Wed, 30 Mar 2016 11:23:54 -0300
+Subject: [PATCH 1/2] crda: support python 3 in utils/key2pub.py
+
+utils/key2pub.py can now be run under either python 2.7 or python 3.x.
+This required some minor syntactical changes as well as switching from
+M2Crypto to pycrypto, since M2Crypto doesn't support python 3.x.
+
+In addition, some errors in the generated source file keys-ssl.h are
+fixed:
+
+  * The correct OpenSSL header for BN_ULONG is included.
+
+  * The generated constants are given the 'ull' suffix to prevent
+    warnings about constants that are too large.
+
+[Gustavo: don't call /utils/key2pub.py since that doesn't compute]
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Backport
+cdra seems to be a stalled project.
+
+Signed-off-by: Armin Kuster <akuster808@gmail.com>
+
+---
+Status: submitted upstream by author but not (yet) accepted
+URL: http://www.spinics.net/lists/linux-wireless/msg138936.html
+
+ Makefile         |   2 +-
+ utils/key2pub.py | 146 ++++++++++++++++++++++++++++---------------------------
+ 2 files changed, 75 insertions(+), 73 deletions(-)
+
+Index: crda-3.18/Makefile
+===================================================================
+--- crda-3.18.orig/Makefile
++++ crda-3.18/Makefile
+@@ -112,7 +112,7 @@ $(REG_BIN):
+ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
+ 	$(NQ) '  GEN ' $@
+ 	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
+-	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
++	$(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
+ 
+ $(LIBREG): reglib.c
+ 	$(NQ) '  CC  ' $@
+Index: crda-3.18/utils/key2pub.py
+===================================================================
+--- crda-3.18.orig/utils/key2pub.py
++++ crda-3.18/utils/key2pub.py
+@@ -1,80 +1,77 @@
+ #!/usr/bin/env python
+ 
++import io
+ import sys
+ try:
+-       from M2Crypto import RSA
+-except ImportError, e:
+-       sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message)
+-       sys.stderr.write('Please install the "M2Crypto" Python module.\n')
+-       sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n')
+-       sys.exit(1)
++    from Crypto.PublicKey import RSA
++except ImportError as e:
++    sys.stderr.write('ERROR: Failed to import the "Crypto.PublicKey" module: %s\n' % e.message)
++    sys.stderr.write('Please install the "Crypto.PublicKey" Python module.\n')
++    sys.stderr.write('On Debian GNU/Linux the package is called "python-crypto".\n')
++    sys.exit(1)
++
++def bitwise_collect(value, radix_bits):
++    words = []
++    radix_mask = (1 << radix_bits) - 1
++    while value != 0:
++        words.append(value & radix_mask)
++        value >>= radix_bits
++    return words
+ 
+ def print_ssl_64(output, name, val):
+-    while val[0] == '\0':
+-        val = val[1:]
+-    while len(val) % 8:
+-        val = '\0' + val
+-    vnew = []
+-    while len(val):
+-        vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]))
+-        val = val[8:]
+-    vnew.reverse()
+-    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
++    # OpenSSL expects 64-bit words given least-significant-word first.
++    vwords = bitwise_collect(val, 64)
++
++    output.write(u'static BN_ULONG {}[] = {{\n'.format(name))
+     idx = 0
+-    for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
++    for vword in vwords:
+         if not idx:
+-            output.write('\t')
+-        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
++            output.write(u'\t')
++        output.write(u'0x{:016x}ULL, '.format(vword))
+         idx += 1
+         if idx == 2:
+             idx = 0
+-            output.write('\n')
++            output.write(u'\n')
+     if idx:
+-        output.write('\n')
+-    output.write('};\n\n')
++        output.write(u'\n')
++    output.write(u'};\n\n')
+ 
+ def print_ssl_32(output, name, val):
+-    while val[0] == '\0':
+-        val = val[1:]
+-    while len(val) % 4:
+-        val = '\0' + val
+-    vnew = []
+-    while len(val):
+-        vnew.append((val[0], val[1], val[2], val[3], ))
+-        val = val[4:]
+-    vnew.reverse()
+-    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
++    # OpenSSL expects 32-bit words given least-significant-word first.
++    vwords = bitwise_collect(val, 32)
++
++    output.write(u'static BN_ULONG {}[] = {{\n'.format(name))
+     idx = 0
+-    for v1, v2, v3, v4 in vnew:
++    for vword in vwords:
+         if not idx:
+-            output.write('\t')
+-        output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4)))
++            output.write(u'\t')
++        output.write(u'0x{:08x}, '.format(vword))
+         idx += 1
+         if idx == 4:
+             idx = 0
+-            output.write('\n')
++            output.write(u'\n')
+     if idx:
+-        output.write('\n')
+-    output.write('};\n\n')
++        output.write(u'\n')
++    output.write(u'};\n\n')
+ 
+ def print_ssl(output, name, val):
+     import os
+-    output.write('#include <stdint.h>\n')
+-    output.write('#include <openssl/bn.h>\n')
++    output.write(u'#include <stdint.h>\n')
++    output.write(u'#include <openssl/bn.h>\n')
+     if os.getenv('TARGET_BITS') == '64':
+         return print_ssl_64(output, name, val)
+     else:
+         return print_ssl_32(output, name, val)
+ 
+ def print_ssl_keys(output, n):
+-    output.write(r'''
++    output.write(u'''
+ struct pubkey {
+ 	struct bignum_st e, n;
+ };
+ 
+-#define KEY(data) {				\
+-	.d = data,				\
+-	.top = sizeof(data)/sizeof(data[0]),	\
++#define KEY(data) {                          \\
++	.d = data,                           \\
++	.top = sizeof(data)/sizeof(data[0]), \\
+ }
+ 
+ #define KEYS(e,n)	{ KEY(e), KEY(n), }
+@@ -82,46 +79,47 @@ struct pubkey {
+ static struct pubkey keys[] __attribute__((unused))= {
+ ''')
+     for n in xrange(n + 1):
+-        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
+-    output.write('};\n')
++        output.write(u'	KEYS(e_{0}, n_{0}),\n'.format(n))
++    output.write(u'};\n')
+     pass
+ 
+ def print_gcrypt(output, name, val):
+-    output.write('#include <stdint.h>\n')
+-    while val[0] == '\0':
+-        val = val[1:]
+-    output.write('static const uint8_t %s[%d] = {\n' % (name, len(val)))
++    # gcrypt expects 8-bit words most-significant-word first
++    vwords = bitwise_collect(val, 8)
++    vwords.reverse()
++
++    output.write(u'#include <stdint.h>\n')
++    output.write(u'static const uint8_t %s[%d] = {\n' % (name, len(vwords)))
+     idx = 0
+-    for v in val:
++    for vword in vwords:
+         if not idx:
+-            output.write('\t')
+-        output.write('0x%.2x, ' % ord(v))
++            output.write(u'\t')
++        output.write(u'0x{:02x}, '.format(vword))
+         idx += 1
+         if idx == 8:
+             idx = 0
+-            output.write('\n')
++            output.write(u'\n')
+     if idx:
+-        output.write('\n')
+-    output.write('};\n\n')
++        output.write(u'\n')
++    output.write(u'};\n\n')
+ 
+ def print_gcrypt_keys(output, n):
+-    output.write(r'''
++    output.write(u'''
+ struct key_params {
+ 	const uint8_t *e, *n;
+ 	uint32_t len_e, len_n;
+ };
+ 
+-#define KEYS(_e, _n) {			\
+-	.e = _e, .len_e = sizeof(_e),	\
+-	.n = _n, .len_n = sizeof(_n),	\
++#define KEYS(_e, _n) {                \\
++	.e = _e, .len_e = sizeof(_e), \\
++	.n = _n, .len_n = sizeof(_n), \\
+ }
+ 
+ static const struct key_params keys[] __attribute__((unused))= {
+ ''')
+-    for n in xrange(n + 1):
+-        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
+-    output.write('};\n')
+-    
++    for n in range(n + 1):
++        output.write(u'	KEYS(e_{0}, n_{0}),\n'.format(n))
++    output.write(u'};\n')    
+ 
+ modes = {
+     '--ssl': (print_ssl, print_ssl_keys),
+@@ -136,21 +134,21 @@ except IndexError:
+     mode = None
+ 
+ if not mode in modes:
+-    print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))
++    print('Usage: {} [{}] input-file... output-file'.format(sys.argv[0], '|'.join(modes.keys())))
+     sys.exit(2)
+ 
+-output = open(outfile, 'w')
++output = io.open(outfile, 'w')
+ 
+ # load key
+ idx = 0
+ for f in files:
+-    try:
+-        key = RSA.load_pub_key(f)
+-    except RSA.RSAError:
+-        key = RSA.load_key(f)
+ 
+-    modes[mode][0](output, 'e_%d' % idx, key.e[4:])
+-    modes[mode][0](output, 'n_%d' % idx, key.n[4:])
++    key_contents = io.open(f, 'rb').read()
++    key = RSA.importKey(key_contents)
++
++    modes[mode][0](output, 'e_{}'.format(idx), key.e)
++    modes[mode][0](output, 'n_{}'.format(idx), key.n)
++
+     idx += 1
+ 
+ modes[mode][1](output, idx - 1)
diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
index dbddd55..ab27614 100644
--- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb
+++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
@@ -4,7 +4,7 @@ SECTION = "net"
 LICENSE = "copyleft-next-0.3.0"
 LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe"
 
-DEPENDS = "python-m2crypto-native python-native libgcrypt libnl openssl"
+DEPENDS = "python-pycrypto-native python-native libgcrypt libnl openssl"
 
 SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
            file://do-not-run-ldconfig-if-destdir-is-set.patch \
@@ -14,6 +14,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
            file://make.patch \
            file://use-target-word-size-instead-of-host-s.patch \
            file://fix-issues-when-USE_OPENSSL-1.patch \
+           file://0001-crda-support-python-3-in-utils-key2pub.py.patch \
 "
 SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a"
 SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [meta-networking][PATCH] crda: fix build issue do to missing python module
  2017-02-06 16:39 [meta-networking][PATCH] crda: fix build issue do to missing python module Armin Kuster
@ 2017-02-06 17:10 ` akuster808
  2017-02-07  7:41   ` Patrick Ohly
  2017-02-07 21:54 ` [meta-networking][PATCH] crda: fix build issue do to missing python module akuster808
  1 sibling, 1 reply; 10+ messages in thread
From: akuster808 @ 2017-02-06 17:10 UTC (permalink / raw)
  To: openembedded-devel, joe_macdonald

please drop. this is fixed via a change in master-next.

http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2e83e33c592543045a7761907d8cd62937e1e60d


- armin



On 02/06/2017 08:39 AM, Armin Kuster wrote:
> this now requires python-pycrypto module to fix plus upstream patch
>
> | ERROR: oe_runmake failed
> |   GEN  keys-ssl.c
> |   Trusted pubkeys: pubkeys/linville.key.pub.pem pubkeys/sforshee.key.pub.pem
> | ERROR: Failed to import the "Crypto.PublicKey" module: No module named Crypto.PublicKey
>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>   ...crda-support-python-3-in-utils-key2pub.py.patch | 271 +++++++++++++++++++++
>   .../recipes-connectivity/crda/crda_3.18.bb         |   3 +-
>   2 files changed, 273 insertions(+), 1 deletion(-)
>   create mode 100644 meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
>
> diff --git a/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> new file mode 100644
> index 0000000..d2ca92f
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> @@ -0,0 +1,271 @@
> +From 797f2836c48f9ba2446629ae4b6867ca1a5ea512 Mon Sep 17 00:00:00 2001
> +From: Taahir Ahmed <ahmed.taahir@gmail.com>
> +Date: Wed, 30 Mar 2016 11:23:54 -0300
> +Subject: [PATCH 1/2] crda: support python 3 in utils/key2pub.py
> +
> +utils/key2pub.py can now be run under either python 2.7 or python 3.x.
> +This required some minor syntactical changes as well as switching from
> +M2Crypto to pycrypto, since M2Crypto doesn't support python 3.x.
> +
> +In addition, some errors in the generated source file keys-ssl.h are
> +fixed:
> +
> +  * The correct OpenSSL header for BN_ULONG is included.
> +
> +  * The generated constants are given the 'ull' suffix to prevent
> +    warnings about constants that are too large.
> +
> +[Gustavo: don't call /utils/key2pub.py since that doesn't compute]
> +
> +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> +
> +Upstream-Status: Backport
> +cdra seems to be a stalled project.
> +
> +Signed-off-by: Armin Kuster <akuster808@gmail.com>
> +
> +---
> +Status: submitted upstream by author but not (yet) accepted
> +URL: http://www.spinics.net/lists/linux-wireless/msg138936.html
> +
> + Makefile         |   2 +-
> + utils/key2pub.py | 146 ++++++++++++++++++++++++++++---------------------------
> + 2 files changed, 75 insertions(+), 73 deletions(-)
> +
> +Index: crda-3.18/Makefile
> +===================================================================
> +--- crda-3.18.orig/Makefile
> ++++ crda-3.18/Makefile
> +@@ -112,7 +112,7 @@ $(REG_BIN):
> + keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
> + 	$(NQ) '  GEN ' $@
> + 	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
> +-	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
> ++	$(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
> +
> + $(LIBREG): reglib.c
> + 	$(NQ) '  CC  ' $@
> +Index: crda-3.18/utils/key2pub.py
> +===================================================================
> +--- crda-3.18.orig/utils/key2pub.py
> ++++ crda-3.18/utils/key2pub.py
> +@@ -1,80 +1,77 @@
> + #!/usr/bin/env python
> +
> ++import io
> + import sys
> + try:
> +-       from M2Crypto import RSA
> +-except ImportError, e:
> +-       sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message)
> +-       sys.stderr.write('Please install the "M2Crypto" Python module.\n')
> +-       sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n')
> +-       sys.exit(1)
> ++    from Crypto.PublicKey import RSA
> ++except ImportError as e:
> ++    sys.stderr.write('ERROR: Failed to import the "Crypto.PublicKey" module: %s\n' % e.message)
> ++    sys.stderr.write('Please install the "Crypto.PublicKey" Python module.\n')
> ++    sys.stderr.write('On Debian GNU/Linux the package is called "python-crypto".\n')
> ++    sys.exit(1)
> ++
> ++def bitwise_collect(value, radix_bits):
> ++    words = []
> ++    radix_mask = (1 << radix_bits) - 1
> ++    while value != 0:
> ++        words.append(value & radix_mask)
> ++        value >>= radix_bits
> ++    return words
> +
> + def print_ssl_64(output, name, val):
> +-    while val[0] == '\0':
> +-        val = val[1:]
> +-    while len(val) % 8:
> +-        val = '\0' + val
> +-    vnew = []
> +-    while len(val):
> +-        vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]))
> +-        val = val[8:]
> +-    vnew.reverse()
> +-    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
> ++    # OpenSSL expects 64-bit words given least-significant-word first.
> ++    vwords = bitwise_collect(val, 64)
> ++
> ++    output.write(u'static BN_ULONG {}[] = {{\n'.format(name))
> +     idx = 0
> +-    for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
> ++    for vword in vwords:
> +         if not idx:
> +-            output.write('\t')
> +-        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
> ++            output.write(u'\t')
> ++        output.write(u'0x{:016x}ULL, '.format(vword))
> +         idx += 1
> +         if idx == 2:
> +             idx = 0
> +-            output.write('\n')
> ++            output.write(u'\n')
> +     if idx:
> +-        output.write('\n')
> +-    output.write('};\n\n')
> ++        output.write(u'\n')
> ++    output.write(u'};\n\n')
> +
> + def print_ssl_32(output, name, val):
> +-    while val[0] == '\0':
> +-        val = val[1:]
> +-    while len(val) % 4:
> +-        val = '\0' + val
> +-    vnew = []
> +-    while len(val):
> +-        vnew.append((val[0], val[1], val[2], val[3], ))
> +-        val = val[4:]
> +-    vnew.reverse()
> +-    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
> ++    # OpenSSL expects 32-bit words given least-significant-word first.
> ++    vwords = bitwise_collect(val, 32)
> ++
> ++    output.write(u'static BN_ULONG {}[] = {{\n'.format(name))
> +     idx = 0
> +-    for v1, v2, v3, v4 in vnew:
> ++    for vword in vwords:
> +         if not idx:
> +-            output.write('\t')
> +-        output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4)))
> ++            output.write(u'\t')
> ++        output.write(u'0x{:08x}, '.format(vword))
> +         idx += 1
> +         if idx == 4:
> +             idx = 0
> +-            output.write('\n')
> ++            output.write(u'\n')
> +     if idx:
> +-        output.write('\n')
> +-    output.write('};\n\n')
> ++        output.write(u'\n')
> ++    output.write(u'};\n\n')
> +
> + def print_ssl(output, name, val):
> +     import os
> +-    output.write('#include <stdint.h>\n')
> +-    output.write('#include <openssl/bn.h>\n')
> ++    output.write(u'#include <stdint.h>\n')
> ++    output.write(u'#include <openssl/bn.h>\n')
> +     if os.getenv('TARGET_BITS') == '64':
> +         return print_ssl_64(output, name, val)
> +     else:
> +         return print_ssl_32(output, name, val)
> +
> + def print_ssl_keys(output, n):
> +-    output.write(r'''
> ++    output.write(u'''
> + struct pubkey {
> + 	struct bignum_st e, n;
> + };
> +
> +-#define KEY(data) {				\
> +-	.d = data,				\
> +-	.top = sizeof(data)/sizeof(data[0]),	\
> ++#define KEY(data) {                          \\
> ++	.d = data,                           \\
> ++	.top = sizeof(data)/sizeof(data[0]), \\
> + }
> +
> + #define KEYS(e,n)	{ KEY(e), KEY(n), }
> +@@ -82,46 +79,47 @@ struct pubkey {
> + static struct pubkey keys[] __attribute__((unused))= {
> + ''')
> +     for n in xrange(n + 1):
> +-        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
> +-    output.write('};\n')
> ++        output.write(u'	KEYS(e_{0}, n_{0}),\n'.format(n))
> ++    output.write(u'};\n')
> +     pass
> +
> + def print_gcrypt(output, name, val):
> +-    output.write('#include <stdint.h>\n')
> +-    while val[0] == '\0':
> +-        val = val[1:]
> +-    output.write('static const uint8_t %s[%d] = {\n' % (name, len(val)))
> ++    # gcrypt expects 8-bit words most-significant-word first
> ++    vwords = bitwise_collect(val, 8)
> ++    vwords.reverse()
> ++
> ++    output.write(u'#include <stdint.h>\n')
> ++    output.write(u'static const uint8_t %s[%d] = {\n' % (name, len(vwords)))
> +     idx = 0
> +-    for v in val:
> ++    for vword in vwords:
> +         if not idx:
> +-            output.write('\t')
> +-        output.write('0x%.2x, ' % ord(v))
> ++            output.write(u'\t')
> ++        output.write(u'0x{:02x}, '.format(vword))
> +         idx += 1
> +         if idx == 8:
> +             idx = 0
> +-            output.write('\n')
> ++            output.write(u'\n')
> +     if idx:
> +-        output.write('\n')
> +-    output.write('};\n\n')
> ++        output.write(u'\n')
> ++    output.write(u'};\n\n')
> +
> + def print_gcrypt_keys(output, n):
> +-    output.write(r'''
> ++    output.write(u'''
> + struct key_params {
> + 	const uint8_t *e, *n;
> + 	uint32_t len_e, len_n;
> + };
> +
> +-#define KEYS(_e, _n) {			\
> +-	.e = _e, .len_e = sizeof(_e),	\
> +-	.n = _n, .len_n = sizeof(_n),	\
> ++#define KEYS(_e, _n) {                \\
> ++	.e = _e, .len_e = sizeof(_e), \\
> ++	.n = _n, .len_n = sizeof(_n), \\
> + }
> +
> + static const struct key_params keys[] __attribute__((unused))= {
> + ''')
> +-    for n in xrange(n + 1):
> +-        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
> +-    output.write('};\n')
> +-
> ++    for n in range(n + 1):
> ++        output.write(u'	KEYS(e_{0}, n_{0}),\n'.format(n))
> ++    output.write(u'};\n')
> +
> + modes = {
> +     '--ssl': (print_ssl, print_ssl_keys),
> +@@ -136,21 +134,21 @@ except IndexError:
> +     mode = None
> +
> + if not mode in modes:
> +-    print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))
> ++    print('Usage: {} [{}] input-file... output-file'.format(sys.argv[0], '|'.join(modes.keys())))
> +     sys.exit(2)
> +
> +-output = open(outfile, 'w')
> ++output = io.open(outfile, 'w')
> +
> + # load key
> + idx = 0
> + for f in files:
> +-    try:
> +-        key = RSA.load_pub_key(f)
> +-    except RSA.RSAError:
> +-        key = RSA.load_key(f)
> +
> +-    modes[mode][0](output, 'e_%d' % idx, key.e[4:])
> +-    modes[mode][0](output, 'n_%d' % idx, key.n[4:])
> ++    key_contents = io.open(f, 'rb').read()
> ++    key = RSA.importKey(key_contents)
> ++
> ++    modes[mode][0](output, 'e_{}'.format(idx), key.e)
> ++    modes[mode][0](output, 'n_{}'.format(idx), key.n)
> ++
> +     idx += 1
> +
> + modes[mode][1](output, idx - 1)
> diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
> index dbddd55..ab27614 100644
> --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb
> +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
> @@ -4,7 +4,7 @@ SECTION = "net"
>   LICENSE = "copyleft-next-0.3.0"
>   LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe"
>   
> -DEPENDS = "python-m2crypto-native python-native libgcrypt libnl openssl"
> +DEPENDS = "python-pycrypto-native python-native libgcrypt libnl openssl"
>   
>   SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
>              file://do-not-run-ldconfig-if-destdir-is-set.patch \
> @@ -14,6 +14,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
>              file://make.patch \
>              file://use-target-word-size-instead-of-host-s.patch \
>              file://fix-issues-when-USE_OPENSSL-1.patch \
> +           file://0001-crda-support-python-3-in-utils-key2pub.py.patch \
>   "
>   SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a"
>   SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf"



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [meta-networking][PATCH] crda: fix build issue do to missing python module
  2017-02-06 17:10 ` akuster808
@ 2017-02-07  7:41   ` Patrick Ohly
  2017-02-07 10:25     ` Martin Jansa
  0 siblings, 1 reply; 10+ messages in thread
From: Patrick Ohly @ 2017-02-07  7:41 UTC (permalink / raw)
  To: openembedded-devel

On Mon, 2017-02-06 at 09:10 -0800, akuster808 wrote:
> please drop. this is fixed via a change in master-next.
> 
> http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2e83e33c592543045a7761907d8cd62937e1e60d

Let's see whether the magic keyword works :-)

[Patchwork-Status: Superseded]

https://patchwork.openembedded.org/patch/136794/

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [meta-networking][PATCH] crda: fix build issue do to missing python module
  2017-02-07  7:41   ` Patrick Ohly
@ 2017-02-07 10:25     ` Martin Jansa
  2017-02-07 10:59       ` Patchwork-Status via email (was: Re: [meta-networking][PATCH] crda: fix build issue do to missing python module) Patrick Ohly
  0 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2017-02-07 10:25 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 922 bytes --]

On Tue, Feb 07, 2017 at 08:41:14AM +0100, Patrick Ohly wrote:
> On Mon, 2017-02-06 at 09:10 -0800, akuster808 wrote:
> > please drop. this is fixed via a change in master-next.
> > 
> > http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2e83e33c592543045a7761907d8cd62937e1e60d
> 
> Let's see whether the magic keyword works :-)
> 
> [Patchwork-Status: Superseded]
> 
> https://patchwork.openembedded.org/patch/136794/
> 
> -- 
> Best Regards, Patrick Ohly
> 
> The content of this message is my personal opinion only and although
> I am an employee of Intel, the statements I make here in no way
> represent Intel's position on the issue, nor am I authorized to speak
> on behalf of Intel on this matter.

If it was supposed to update status on Patchwork, then it didn't work
it's still in "New" state.

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Patchwork-Status via email (was: Re: [meta-networking][PATCH] crda: fix build issue do to missing python module)
  2017-02-07 10:25     ` Martin Jansa
@ 2017-02-07 10:59       ` Patrick Ohly
  2017-02-07 18:32         ` Patchwork-Status via email Jose Lamego
  2017-02-07 21:57         ` akuster808
  0 siblings, 2 replies; 10+ messages in thread
From: Patrick Ohly @ 2017-02-07 10:59 UTC (permalink / raw)
  To: openembedded-devel, Jose Lamego

On Tue, 2017-02-07 at 11:25 +0100, Martin Jansa wrote:
> On Tue, Feb 07, 2017 at 08:41:14AM +0100, Patrick Ohly wrote:
> > On Mon, 2017-02-06 at 09:10 -0800, akuster808 wrote:
> > > please drop. this is fixed via a change in master-next.
> > > 
> > > http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2e83e33c592543045a7761907d8cd62937e1e60d
> > 
> > Let's see whether the magic keyword works :-)
> > 
> > [Patchwork-Status: Superseded]
> > 
> > https://patchwork.openembedded.org/patch/136794/
> > 
> > -- 
> > Best Regards, Patrick Ohly
> > 
> > The content of this message is my personal opinion only and although
> > I am an employee of Intel, the statements I make here in no way
> > represent Intel's position on the issue, nor am I authorized to speak
> > on behalf of Intel on this matter.
> 
> If it was supposed to update status on Patchwork, then it didn't work
> it's still in "New" state.

Jose, in your "parsemail: Set patch state from email metadata" patch you
said that it "allows project maintainers to change a patch status
directly from an email message".

Can you clarify who the "project maintainers" are who can use this email
interface?

What about this use case here: the original author wants to retract a
patch. Can he do that via email and/or the web interface?

I wasn't the original author and probably also no project maintainer, so
I guess that's why my email had no effect. Can we enable some kind of
error response for such cases?

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Patchwork-Status via email
  2017-02-07 10:59       ` Patchwork-Status via email (was: Re: [meta-networking][PATCH] crda: fix build issue do to missing python module) Patrick Ohly
@ 2017-02-07 18:32         ` Jose Lamego
  2017-02-07 19:10           ` Patrick Ohly
  2017-02-07 21:57         ` akuster808
  1 sibling, 1 reply; 10+ messages in thread
From: Jose Lamego @ 2017-02-07 18:32 UTC (permalink / raw)
  To: openembedded-devel


[-- Attachment #1.1: Type: text/plain, Size: 2068 bytes --]



On 02/07/2017 04:59 AM, Patrick Ohly wrote:
> On Tue, 2017-02-07 at 11:25 +0100, Martin Jansa wrote:
>> On Tue, Feb 07, 2017 at 08:41:14AM +0100, Patrick Ohly wrote:
>>> On Mon, 2017-02-06 at 09:10 -0800, akuster808 wrote:
>>>> please drop. this is fixed via a change in master-next.
>>>>
>>>> http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2e83e33c592543045a7761907d8cd62937e1e60d
>>>
>>> Let's see whether the magic keyword works :-)
>>>
>>> [Patchwork-Status: Superseded]
>>>
>>> https://patchwork.openembedded.org/patch/136794/
>>>
>>> -- 
>>> Best Regards, Patrick Ohly
>>>
>>> The content of this message is my personal opinion only and although
>>> I am an employee of Intel, the statements I make here in no way
>>> represent Intel's position on the issue, nor am I authorized to speak
>>> on behalf of Intel on this matter.
>>
>> If it was supposed to update status on Patchwork, then it didn't work
>> it's still in "New" state.
> 
> Jose, in your "parsemail: Set patch state from email metadata" patch you
> said that it "allows project maintainers to change a patch status
> directly from an email message".
> 
> Can you clarify who the "project maintainers" are who can use this email
> interface?
> 
Correct, the patch status change through email is available only for
those registered as project maintainers in Patchwork. These are listed
under "About this project" section at the web interface.

> What about this use case here: the original author wants to retract a
> patch. Can he do that via email and/or the web interface?
> 
Patch submitter (and project maintainers) can update status manually
through the web interface.

> I wasn't the original author and probably also no project maintainer, so
> I guess that's why my email had no effect. Can we enable some kind of
> error response for such cases?
> 
Good idea. I've filed a request to track this:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=11027

-- 
Jose Lamego | OTC Embedded Platforms & Tools | GDC


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Patchwork-Status via email
  2017-02-07 18:32         ` Patchwork-Status via email Jose Lamego
@ 2017-02-07 19:10           ` Patrick Ohly
  2017-02-07 19:22             ` Jose Lamego
  0 siblings, 1 reply; 10+ messages in thread
From: Patrick Ohly @ 2017-02-07 19:10 UTC (permalink / raw)
  To: openembedded-devel

On Tue, 2017-02-07 at 12:32 -0600, Jose Lamego wrote:
> 
> On 02/07/2017 04:59 AM, Patrick Ohly wrote:
> > What about this use case here: the original author wants to retract a
> > patch. Can he do that via email and/or the web interface?
> > 
> Patch submitter (and project maintainers) can update status manually
> through the web interface.

I suspect that this makes the email interface less useful that it could
be. May I suggest that we relax the permission check so that also patch
authors can change the status of a patch?

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Patchwork-Status via email
  2017-02-07 19:10           ` Patrick Ohly
@ 2017-02-07 19:22             ` Jose Lamego
  0 siblings, 0 replies; 10+ messages in thread
From: Jose Lamego @ 2017-02-07 19:22 UTC (permalink / raw)
  To: openembedded-devel


[-- Attachment #1.1: Type: text/plain, Size: 726 bytes --]



On 02/07/2017 01:10 PM, Patrick Ohly wrote:
> On Tue, 2017-02-07 at 12:32 -0600, Jose Lamego wrote:
>>
>> On 02/07/2017 04:59 AM, Patrick Ohly wrote:
>>> What about this use case here: the original author wants to retract a
>>> patch. Can he do that via email and/or the web interface?
>>>
>> Patch submitter (and project maintainers) can update status manually
>> through the web interface.
> 
> I suspect that this makes the email interface less useful that it could
> be. May I suggest that we relax the permission check so that also patch
> authors can change the status of a patch?
> 
Agree. I will handle this under the mentioned bugzilla.

-- 
Jose Lamego | OTC Embedded Platforms & Tools | GDC


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [meta-networking][PATCH] crda: fix build issue do to missing python module
  2017-02-06 16:39 [meta-networking][PATCH] crda: fix build issue do to missing python module Armin Kuster
  2017-02-06 17:10 ` akuster808
@ 2017-02-07 21:54 ` akuster808
  1 sibling, 0 replies; 10+ messages in thread
From: akuster808 @ 2017-02-07 21:54 UTC (permalink / raw)
  To: openembedded-devel, joe_macdonald



[Patchwork-Status: Superseded]

On 02/06/2017 08:39 AM, Armin Kuster wrote:
> this now requires python-pycrypto module to fix plus upstream patch
>
> | ERROR: oe_runmake failed
> |   GEN  keys-ssl.c
> |   Trusted pubkeys: pubkeys/linville.key.pub.pem pubkeys/sforshee.key.pub.pem
> | ERROR: Failed to import the "Crypto.PublicKey" module: No module named Crypto.PublicKey
>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>   ...crda-support-python-3-in-utils-key2pub.py.patch | 271 +++++++++++++++++++++
>   .../recipes-connectivity/crda/crda_3.18.bb         |   3 +-
>   2 files changed, 273 insertions(+), 1 deletion(-)
>   create mode 100644 meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
>
> diff --git a/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> new file mode 100644
> index 0000000..d2ca92f
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/crda/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> @@ -0,0 +1,271 @@
> +From 797f2836c48f9ba2446629ae4b6867ca1a5ea512 Mon Sep 17 00:00:00 2001
> +From: Taahir Ahmed <ahmed.taahir@gmail.com>
> +Date: Wed, 30 Mar 2016 11:23:54 -0300
> +Subject: [PATCH 1/2] crda: support python 3 in utils/key2pub.py
> +
> +utils/key2pub.py can now be run under either python 2.7 or python 3.x.
> +This required some minor syntactical changes as well as switching from
> +M2Crypto to pycrypto, since M2Crypto doesn't support python 3.x.
> +
> +In addition, some errors in the generated source file keys-ssl.h are
> +fixed:
> +
> +  * The correct OpenSSL header for BN_ULONG is included.
> +
> +  * The generated constants are given the 'ull' suffix to prevent
> +    warnings about constants that are too large.
> +
> +[Gustavo: don't call /utils/key2pub.py since that doesn't compute]
> +
> +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> +
> +Upstream-Status: Backport
> +cdra seems to be a stalled project.
> +
> +Signed-off-by: Armin Kuster <akuster808@gmail.com>
> +
> +---
> +Status: submitted upstream by author but not (yet) accepted
> +URL: http://www.spinics.net/lists/linux-wireless/msg138936.html
> +
> + Makefile         |   2 +-
> + utils/key2pub.py | 146 ++++++++++++++++++++++++++++---------------------------
> + 2 files changed, 75 insertions(+), 73 deletions(-)
> +
> +Index: crda-3.18/Makefile
> +===================================================================
> +--- crda-3.18.orig/Makefile
> ++++ crda-3.18/Makefile
> +@@ -112,7 +112,7 @@ $(REG_BIN):
> + keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
> + 	$(NQ) '  GEN ' $@
> + 	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
> +-	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
> ++	$(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
> +
> + $(LIBREG): reglib.c
> + 	$(NQ) '  CC  ' $@
> +Index: crda-3.18/utils/key2pub.py
> +===================================================================
> +--- crda-3.18.orig/utils/key2pub.py
> ++++ crda-3.18/utils/key2pub.py
> +@@ -1,80 +1,77 @@
> + #!/usr/bin/env python
> +
> ++import io
> + import sys
> + try:
> +-       from M2Crypto import RSA
> +-except ImportError, e:
> +-       sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message)
> +-       sys.stderr.write('Please install the "M2Crypto" Python module.\n')
> +-       sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n')
> +-       sys.exit(1)
> ++    from Crypto.PublicKey import RSA
> ++except ImportError as e:
> ++    sys.stderr.write('ERROR: Failed to import the "Crypto.PublicKey" module: %s\n' % e.message)
> ++    sys.stderr.write('Please install the "Crypto.PublicKey" Python module.\n')
> ++    sys.stderr.write('On Debian GNU/Linux the package is called "python-crypto".\n')
> ++    sys.exit(1)
> ++
> ++def bitwise_collect(value, radix_bits):
> ++    words = []
> ++    radix_mask = (1 << radix_bits) - 1
> ++    while value != 0:
> ++        words.append(value & radix_mask)
> ++        value >>= radix_bits
> ++    return words
> +
> + def print_ssl_64(output, name, val):
> +-    while val[0] == '\0':
> +-        val = val[1:]
> +-    while len(val) % 8:
> +-        val = '\0' + val
> +-    vnew = []
> +-    while len(val):
> +-        vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]))
> +-        val = val[8:]
> +-    vnew.reverse()
> +-    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
> ++    # OpenSSL expects 64-bit words given least-significant-word first.
> ++    vwords = bitwise_collect(val, 64)
> ++
> ++    output.write(u'static BN_ULONG {}[] = {{\n'.format(name))
> +     idx = 0
> +-    for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
> ++    for vword in vwords:
> +         if not idx:
> +-            output.write('\t')
> +-        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
> ++            output.write(u'\t')
> ++        output.write(u'0x{:016x}ULL, '.format(vword))
> +         idx += 1
> +         if idx == 2:
> +             idx = 0
> +-            output.write('\n')
> ++            output.write(u'\n')
> +     if idx:
> +-        output.write('\n')
> +-    output.write('};\n\n')
> ++        output.write(u'\n')
> ++    output.write(u'};\n\n')
> +
> + def print_ssl_32(output, name, val):
> +-    while val[0] == '\0':
> +-        val = val[1:]
> +-    while len(val) % 4:
> +-        val = '\0' + val
> +-    vnew = []
> +-    while len(val):
> +-        vnew.append((val[0], val[1], val[2], val[3], ))
> +-        val = val[4:]
> +-    vnew.reverse()
> +-    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
> ++    # OpenSSL expects 32-bit words given least-significant-word first.
> ++    vwords = bitwise_collect(val, 32)
> ++
> ++    output.write(u'static BN_ULONG {}[] = {{\n'.format(name))
> +     idx = 0
> +-    for v1, v2, v3, v4 in vnew:
> ++    for vword in vwords:
> +         if not idx:
> +-            output.write('\t')
> +-        output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4)))
> ++            output.write(u'\t')
> ++        output.write(u'0x{:08x}, '.format(vword))
> +         idx += 1
> +         if idx == 4:
> +             idx = 0
> +-            output.write('\n')
> ++            output.write(u'\n')
> +     if idx:
> +-        output.write('\n')
> +-    output.write('};\n\n')
> ++        output.write(u'\n')
> ++    output.write(u'};\n\n')
> +
> + def print_ssl(output, name, val):
> +     import os
> +-    output.write('#include <stdint.h>\n')
> +-    output.write('#include <openssl/bn.h>\n')
> ++    output.write(u'#include <stdint.h>\n')
> ++    output.write(u'#include <openssl/bn.h>\n')
> +     if os.getenv('TARGET_BITS') == '64':
> +         return print_ssl_64(output, name, val)
> +     else:
> +         return print_ssl_32(output, name, val)
> +
> + def print_ssl_keys(output, n):
> +-    output.write(r'''
> ++    output.write(u'''
> + struct pubkey {
> + 	struct bignum_st e, n;
> + };
> +
> +-#define KEY(data) {				\
> +-	.d = data,				\
> +-	.top = sizeof(data)/sizeof(data[0]),	\
> ++#define KEY(data) {                          \\
> ++	.d = data,                           \\
> ++	.top = sizeof(data)/sizeof(data[0]), \\
> + }
> +
> + #define KEYS(e,n)	{ KEY(e), KEY(n), }
> +@@ -82,46 +79,47 @@ struct pubkey {
> + static struct pubkey keys[] __attribute__((unused))= {
> + ''')
> +     for n in xrange(n + 1):
> +-        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
> +-    output.write('};\n')
> ++        output.write(u'	KEYS(e_{0}, n_{0}),\n'.format(n))
> ++    output.write(u'};\n')
> +     pass
> +
> + def print_gcrypt(output, name, val):
> +-    output.write('#include <stdint.h>\n')
> +-    while val[0] == '\0':
> +-        val = val[1:]
> +-    output.write('static const uint8_t %s[%d] = {\n' % (name, len(val)))
> ++    # gcrypt expects 8-bit words most-significant-word first
> ++    vwords = bitwise_collect(val, 8)
> ++    vwords.reverse()
> ++
> ++    output.write(u'#include <stdint.h>\n')
> ++    output.write(u'static const uint8_t %s[%d] = {\n' % (name, len(vwords)))
> +     idx = 0
> +-    for v in val:
> ++    for vword in vwords:
> +         if not idx:
> +-            output.write('\t')
> +-        output.write('0x%.2x, ' % ord(v))
> ++            output.write(u'\t')
> ++        output.write(u'0x{:02x}, '.format(vword))
> +         idx += 1
> +         if idx == 8:
> +             idx = 0
> +-            output.write('\n')
> ++            output.write(u'\n')
> +     if idx:
> +-        output.write('\n')
> +-    output.write('};\n\n')
> ++        output.write(u'\n')
> ++    output.write(u'};\n\n')
> +
> + def print_gcrypt_keys(output, n):
> +-    output.write(r'''
> ++    output.write(u'''
> + struct key_params {
> + 	const uint8_t *e, *n;
> + 	uint32_t len_e, len_n;
> + };
> +
> +-#define KEYS(_e, _n) {			\
> +-	.e = _e, .len_e = sizeof(_e),	\
> +-	.n = _n, .len_n = sizeof(_n),	\
> ++#define KEYS(_e, _n) {                \\
> ++	.e = _e, .len_e = sizeof(_e), \\
> ++	.n = _n, .len_n = sizeof(_n), \\
> + }
> +
> + static const struct key_params keys[] __attribute__((unused))= {
> + ''')
> +-    for n in xrange(n + 1):
> +-        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
> +-    output.write('};\n')
> +-
> ++    for n in range(n + 1):
> ++        output.write(u'	KEYS(e_{0}, n_{0}),\n'.format(n))
> ++    output.write(u'};\n')
> +
> + modes = {
> +     '--ssl': (print_ssl, print_ssl_keys),
> +@@ -136,21 +134,21 @@ except IndexError:
> +     mode = None
> +
> + if not mode in modes:
> +-    print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))
> ++    print('Usage: {} [{}] input-file... output-file'.format(sys.argv[0], '|'.join(modes.keys())))
> +     sys.exit(2)
> +
> +-output = open(outfile, 'w')
> ++output = io.open(outfile, 'w')
> +
> + # load key
> + idx = 0
> + for f in files:
> +-    try:
> +-        key = RSA.load_pub_key(f)
> +-    except RSA.RSAError:
> +-        key = RSA.load_key(f)
> +
> +-    modes[mode][0](output, 'e_%d' % idx, key.e[4:])
> +-    modes[mode][0](output, 'n_%d' % idx, key.n[4:])
> ++    key_contents = io.open(f, 'rb').read()
> ++    key = RSA.importKey(key_contents)
> ++
> ++    modes[mode][0](output, 'e_{}'.format(idx), key.e)
> ++    modes[mode][0](output, 'n_{}'.format(idx), key.n)
> ++
> +     idx += 1
> +
> + modes[mode][1](output, idx - 1)
> diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
> index dbddd55..ab27614 100644
> --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb
> +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb
> @@ -4,7 +4,7 @@ SECTION = "net"
>   LICENSE = "copyleft-next-0.3.0"
>   LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe"
>   
> -DEPENDS = "python-m2crypto-native python-native libgcrypt libnl openssl"
> +DEPENDS = "python-pycrypto-native python-native libgcrypt libnl openssl"
>   
>   SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
>              file://do-not-run-ldconfig-if-destdir-is-set.patch \
> @@ -14,6 +14,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \
>              file://make.patch \
>              file://use-target-word-size-instead-of-host-s.patch \
>              file://fix-issues-when-USE_OPENSSL-1.patch \
> +           file://0001-crda-support-python-3-in-utils-key2pub.py.patch \
>   "
>   SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a"
>   SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf"



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: Patchwork-Status via email
  2017-02-07 10:59       ` Patchwork-Status via email (was: Re: [meta-networking][PATCH] crda: fix build issue do to missing python module) Patrick Ohly
  2017-02-07 18:32         ` Patchwork-Status via email Jose Lamego
@ 2017-02-07 21:57         ` akuster808
  1 sibling, 0 replies; 10+ messages in thread
From: akuster808 @ 2017-02-07 21:57 UTC (permalink / raw)
  To: openembedded-devel



On 02/07/2017 02:59 AM, Patrick Ohly wrote:
> On Tue, 2017-02-07 at 11:25 +0100, Martin Jansa wrote:
>> On Tue, Feb 07, 2017 at 08:41:14AM +0100, Patrick Ohly wrote:
>>> On Mon, 2017-02-06 at 09:10 -0800, akuster808 wrote:
>>>> please drop. this is fixed via a change in master-next.
>>>>
>>>> http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2e83e33c592543045a7761907d8cd62937e1e60d
>>> Let's see whether the magic keyword works :-)
>>>
>>> [Patchwork-Status: Superseded]
>>>
>>> https://patchwork.openembedded.org/patch/136794/
>>>
>>> -- 
>>> Best Regards, Patrick Ohly
>>>
>>> The content of this message is my personal opinion only and although
>>> I am an employee of Intel, the statements I make here in no way
>>> represent Intel's position on the issue, nor am I authorized to speak
>>> on behalf of Intel on this matter.
>> If it was supposed to update status on Patchwork, then it didn't work
>> it's still in "New" state.
> Jose, in your "parsemail: Set patch state from email metadata" patch you
> said that it "allows project maintainers to change a patch status
> directly from an email message".
>
> Can you clarify who the "project maintainers" are who can use this email
> interface?

The list of maintainers (if its the same list) can be found on

https://patchwork.openembedded.org/project/oe/

BTW, is there any doc on the keywords?

- armin
> What about this use case here: the original author wants to retract a
> patch. Can he do that via email and/or the web interface?
>
> I wasn't the original author and probably also no project maintainer, so
> I guess that's why my email had no effect. Can we enable some kind of
> error response for such cases?
>



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-02-07 21:57 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-06 16:39 [meta-networking][PATCH] crda: fix build issue do to missing python module Armin Kuster
2017-02-06 17:10 ` akuster808
2017-02-07  7:41   ` Patrick Ohly
2017-02-07 10:25     ` Martin Jansa
2017-02-07 10:59       ` Patchwork-Status via email (was: Re: [meta-networking][PATCH] crda: fix build issue do to missing python module) Patrick Ohly
2017-02-07 18:32         ` Patchwork-Status via email Jose Lamego
2017-02-07 19:10           ` Patrick Ohly
2017-02-07 19:22             ` Jose Lamego
2017-02-07 21:57         ` akuster808
2017-02-07 21:54 ` [meta-networking][PATCH] crda: fix build issue do to missing python module akuster808

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox