2008-09-28 20:06:45

by Davide Pesavento

Subject: [CRDA PATCH 1/4] Do not initialize gcrypt twice.

Signed-off-by: Davide Pesavento <[email protected]>

---
crda.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crda.c b/crda.c
index 98d80f5..4c7681c 100644
--- a/crda.c
+++ b/crda.c
@@ -14,7 +14,7 @@

#include <netlink/genl/genl.h>
#include <netlink/genl/family.h>
-#include <netlink/genl/ctrl.h>
+#include <netlink/genl/ctrl.h>
#include <netlink/msg.h>
#include <netlink/attr.h>
#include <linux/nl80211.h>
@@ -192,14 +192,12 @@ int main(int argc, char **argv)
int ok = 0;
#endif
#ifdef USE_GCRYPT
- /* initialise */
- gcry_check_version(NULL);
-
gcry_mpi_t mpi_e, mpi_n;
gcry_sexp_t rsa, signature, data;
__u8 hash[20];
int ok = 0;
#endif
+
char *regdb = "/usr/lib/crda/regulatory.bin";

if (argc != 1) {
@@ -213,7 +211,7 @@ int main(int argc, char **argv)
return -EINVAL;
}

-
+
if (!is_alpha2(env_country) && !is_world_regdom(env_country)) {
fprintf(stderr, "Invalid alpha2 set in COUNTRY\n");
return -EINVAL;
--
1.6.0.2

2008-09-30 15:09:51

by Luis R. Rodriguez

Subject: Re: [CRDA PATCH 1/4] Do not initialize gcrypt twice.

On Sun, Sep 28, 2008 at 1:06 PM, Davide Pesavento <[email protected]> wrote:
> Signed-off-by: Davide Pesavento <[email protected]>

Thanks for all this, pushed back out.

Luis