Skip to contentSkip to conversation

crda: do not embed crypto data when USE_OPENSSL=1

PATCH In review Kel Modderman 3 participants 10 messages Mar 4, 2010 – Mar 21, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crda: do not embed crypto data when USE_OPENSSL=1

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

This change does remove support for alternate runtime pubkey dir /etc/wireless-regdb/pubkeys, but wireless-regdb does not currently install custom pubkeys to /etc/wireless-regdb/pubkeys, and I couldn't care less about that feature atm :)

When verification fails provide information about the PUBKEY_DIR variable.

Fix typo (s/make noverify/make all_noverify/).

---

Makefile +18 -17
@@ -16,13 +16,6 @@ UDEV_LEVEL=$(CRDA_UDEV_LEVEL)-
 # a different location.
 UDEV_RULE_DIR?=/lib/udev/rules.d/
 
-# If your distribution requires a custom pubkeys dir
-# you must update this variable to reflect where the
-# keys are put when building. For example you can run
-# with make PUBKEY_DIR=/usr/lib/crda/pubkeys
-PUBKEY_DIR?=pubkeys
-RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
-
 CFLAGS += -Wall -g
 
 all: all_noverify verify
@@ -30,17 +23,22 @@ all: all_noverify verify
 all_noverify: crda intersect regdbdump
 
 ifeq ($(USE_OPENSSL),1)
-CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+PUBKEY_DIR?=$(PREFIX)/lib/crda/pubkeys
+CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(PUBKEY_DIR)\" `pkg-config --cflags openssl`
 LDLIBS += `pkg-config --libs openssl`
 
-reglib.o: keys-ssl.c
-
 else
+PUBKEY_DIR?=pubkeys
 CFLAGS += -DUSE_GCRYPT
 LDLIBS += -lgcrypt
 
 reglib.o: keys-gcrypt.c
 
+keys-gcrypt.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) $@
+
 endif
 MKDIR ?= mkdir -p
 INSTALL ?= install
@@ -82,15 +80,10 @@ $(REG_BIN):
 	$(NQ) $(REG_GIT)
 	$(NQ)
 	$(NQ) "Once cloned (no need to build) cp regulatory.bin to $(REG_BIN)"
-	$(NQ) "Use \"make noverify\" to disable verification"
+	$(NQ) "Use \"make all_noverify\" to disable verification"
 	$(NQ)
 	$(Q) exit 1
 
-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) $@
-
 %.o: %.c regdb.h
 	$(NQ) '  CC  ' $@
 	$(Q)$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -109,7 +102,15 @@ intersect: reglib.o intersect.o print-re
 
 verify: $(REG_BIN) regdbdump
 	$(NQ) '  CHK  $(REG_BIN)'
-	$(Q)./regdbdump $(REG_BIN) >/dev/null
+	@if ! ./regdbdump $(REG_BIN) >/dev/null; then \
+		echo; \
+		echo "If your distribution requires a custom pubkeys dir you must set"; \
+		echo "PUBKEY_DIR to path where the keys are installed by wireless-regdb."; \
+		echo "For example:"; \
+		echo "    make PUBKEY_DIR=/lib/crda/pubkeys"; \
+		echo; \
+		exit 1; \
+	fi
 
 %.gz: %
 	@$(NQ) ' GZIP' $<
reglib.c +1 -23
@@ -18,10 +18,6 @@
 
 #include "reglib.h"
 
-#ifdef USE_OPENSSL
-#include "keys-ssl.c"
-#endif
-
 #ifdef USE_GCRYPT
 #include "keys-gcrypt.c"
 #endif
@@ -49,7 +45,6 @@ int crda_verify_db_signature(__u8 *db, i
 #ifdef USE_OPENSSL
 	RSA *rsa;
 	__u8 hash[SHA_DIGEST_LENGTH];
-	unsigned int i;
 	int ok = 0;
 	DIR *pubkey_dir;
 	struct dirent *nextfile;
@@ -61,24 +56,7 @@ int crda_verify_db_signature(__u8 *db, i
 		goto out;
 	}
 
-	for (i = 0; (i < sizeof(keys)/sizeof(keys[0])) && (!ok); i++) {
-		rsa = RSA_new();
-		if (!rsa) {
-			fprintf(stderr, "Failed to create RSA key.\n");
-			goto out;
-		}
-
-		rsa->e = &keys[i].e;
-		rsa->n = &keys[i].n;
-
-		ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
-				db + dblen, siglen, rsa) == 1;
-
-		rsa->e = NULL;
-		rsa->n = NULL;
-		RSA_free(rsa);
-	}
-	if (!ok && (pubkey_dir = opendir(PUBKEY_DIR))) {
+	if ((pubkey_dir = opendir(PUBKEY_DIR))) {
 		while (!ok && (nextfile = readdir(pubkey_dir))) {
 			snprintf(filename, PATH_MAX, "%s/%s", PUBKEY_DIR,
 				nextfile->d_name);
utils/key2pub.py +5 -94

118 lines not on this page · raw message

---

#1 lore raw
Quoted 8 lines · Kel Modderman

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

Quoted 10 lines

This change does remove support for alternate runtime pubkey dir /etc/wireless-regdb/pubkeys, but wireless-regdb does not currently install custom pubkeys to /etc/wireless-regdb/pubkeys, and I couldn't care less about that feature atm :)

When verification fails provide information about the PUBKEY_DIR variable.

Fix typo (s/make noverify/make all_noverify/).

So you want to remove this feature simply because you don't use it yourself? What problem is it causing?

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#2 lore raw
Quoted 11 lines · On Friday 05 March 2010 01:31:28 John W. Linville wrote:
Quoted 8 lines · Kel Modderman

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

No.

Quoted 6 lines
Quoted 6 lines

This change does remove support for alternate runtime pubkey dir /etc/wireless-regdb/pubkeys, but wireless-regdb does not currently install custom pubkeys to /etc/wireless-regdb/pubkeys, and I couldn't care less about that feature atm :)

Quoted 8 lines
Quoted 5 lines

When verification fails provide information about the PUBKEY_DIR variable.

Fix typo (s/make noverify/make all_noverify/).

So you want to remove this feature simply because you don't use it yourself? What problem is it causing?

New patch attached which doesn't remove the feature.

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

When verification fails provide information about the PUBKEY_DIR variable.

Fix typo (s/make noverify/make all_noverify/).

---

Makefile +20 -17
@@ -16,13 +16,6 @@ UDEV_LEVEL=$(CRDA_UDEV_LEVEL)-
 # a different location.
 UDEV_RULE_DIR?=/lib/udev/rules.d/
 
-# If your distribution requires a custom pubkeys dir
-# you must update this variable to reflect where the
-# keys are put when building. For example you can run
-# with make PUBKEY_DIR=/usr/lib/crda/pubkeys
-PUBKEY_DIR?=pubkeys
-RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
-
 CFLAGS += -Wall -g
 
 all: all_noverify verify
@@ -30,17 +23,24 @@ all: all_noverify verify
 all_noverify: crda intersect regdbdump
 
 ifeq ($(USE_OPENSSL),1)
-CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+PUBKEY_DIR?=$(PREFIX)/lib/crda/pubkeys
+RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl`
+CFLAGS += -DPUBKEY_DIR=\"$(PUBKEY_DIR)\" -DALT_PUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\"
 LDLIBS += `pkg-config --libs openssl`
 
-reglib.o: keys-ssl.c
-
 else
+PUBKEY_DIR?=pubkeys
 CFLAGS += -DUSE_GCRYPT
 LDLIBS += -lgcrypt
 
 reglib.o: keys-gcrypt.c
 
+keys-gcrypt.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) $@
+
 endif
 MKDIR ?= mkdir -p
 INSTALL ?= install
@@ -82,15 +82,10 @@ $(REG_BIN):
 	$(NQ) $(REG_GIT)
 	$(NQ)
 	$(NQ) "Once cloned (no need to build) cp regulatory.bin to $(REG_BIN)"
-	$(NQ) "Use \"make noverify\" to disable verification"
+	$(NQ) "Use \"make all_noverify\" to disable verification"
 	$(NQ)
 	$(Q) exit 1
 
-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) $@
-
 %.o: %.c regdb.h
 	$(NQ) '  CC  ' $@
 	$(Q)$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -109,7 +104,15 @@ intersect: reglib.o intersect.o print-re
 
 verify: $(REG_BIN) regdbdump
 	$(NQ) '  CHK  $(REG_BIN)'
-	$(Q)./regdbdump $(REG_BIN) >/dev/null
+	@if ! ./regdbdump $(REG_BIN) >/dev/null; then \
+		echo; \
+		echo "If your distribution requires a custom pubkeys dir you must set"; \
+		echo "PUBKEY_DIR to path where the keys are installed by wireless-regdb."; \
+		echo "For example:"; \
+		echo "    make PUBKEY_DIR=/lib/crda/pubkeys"; \
+		echo; \
+		exit 1; \
+	fi
 
 %.gz: %
 	@$(NQ) ' GZIP' $<
reglib.c +17 -22
@@ -18,10 +18,6 @@
 
 #include "reglib.h"
 
-#ifdef USE_OPENSSL
-#include "keys-ssl.c"
-#endif
-
 #ifdef USE_GCRYPT
 #include "keys-gcrypt.c"
 #endif
@@ -49,7 +45,6 @@ int crda_verify_db_signature(__u8 *db, i
 #ifdef USE_OPENSSL
 	RSA *rsa;
 	__u8 hash[SHA_DIGEST_LENGTH];
-	unsigned int i;
 	int ok = 0;
 	DIR *pubkey_dir;
 	struct dirent *nextfile;
@@ -61,26 +56,26 @@ int crda_verify_db_signature(__u8 *db, i
 		goto out;
 	}
 
-	for (i = 0; (i < sizeof(keys)/sizeof(keys[0])) && (!ok); i++) {
-		rsa = RSA_new();
-		if (!rsa) {
-			fprintf(stderr, "Failed to create RSA key.\n");
-			goto out;
+	if ((pubkey_dir = opendir(PUBKEY_DIR))) {
+		while (!ok && (nextfile = readdir(pubkey_dir))) {
+			snprintf(filename, PATH_MAX, "%s/%s", PUBKEY_DIR,
+				nextfile->d_name);
+			if ((keyfile = fopen(filename, "rb"))) {
+				rsa = PEM_read_RSA_PUBKEY(keyfile,
+					NULL, NULL, NULL);
+				if (rsa)
+					ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
+						db + dblen, siglen, rsa) == 1;
+				RSA_free(rsa);
+				fclose(keyfile);
+			}
 		}
-
-		rsa->e = &keys[i].e;
-		rsa->n = &keys[i].n;
-
-		ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
-				db + dblen, siglen, rsa) == 1;
-
-		rsa->e = NULL;
-		rsa->n = NULL;
-		RSA_free(rsa);
+		closedir(pubkey_dir);
 	}
-	if (!ok && (pubkey_dir = opendir(PUBKEY_DIR))) {
+
+	if (!ok && (pubkey_dir = opendir(ALT_PUBKEY_DIR))) {
 		while (!ok && (nextfile = readdir(pubkey_dir))) {
-			snprintf(filename, PATH_MAX, "%s/%s", PUBKEY_DIR,
+			snprintf(filename, PATH_MAX, "%s/%s", ALT_PUBKEY_DIR,
 				nextfile->d_name);
 			if ((keyfile = fopen(filename, "rb"))) {
 				rsa = PEM_read_RSA_PUBKEY(keyfile,
utils/key2pub.py +5 -94

118 lines not on this page · raw message

---

#3 lore raw
Quoted 7 lines · Kel Modderman
Quoted 6 lines · On Friday 05 March 2010 01:31:28 John W. Linville wrote:
Quoted 5 lines · Kel Modderman

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

No.

Perhaps you could use a few more words? It seems to me that what limits you is the policies of some distributions. Certainly crda and wireless-regdb can be maintained separately so long as the key doesn't change between builds or with alternate keys installed in the proper locations. Am I missing something?

John

Signature · 2 lines
John W. Linville                Someday the world will need a hero, and you
[email protected]                  might be all we have.  Be ready.
#4 lore raw
Quoted 14 lines · On Friday 05 March 2010 11:37:22 John W. Linville wrote:
Quoted 13 lines · Kel Modderman
Quoted 11 lines · On Friday 05 March 2010 01:31:28 John W. Linville wrote:
Quoted 8 lines · Kel Modderman

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

Quoted 7 lines
Quoted 1 line

No.

Perhaps you could use a few more words? It seems to me that what limits you is the policies of some distributions. Certainly crda and wireless-regdb can be maintained separately so long as the key doesn't change between builds or with alternate keys installed in the proper locations. Am I missing something?

Yes you are missing something. Its not the policy of my distribution which is limiting its the design of the crda/wireless-regdb build systems.

Now that openssl support allows reading pubkeys at runtime, the embedding of crypto data into binaries can be totally removed when built with openssl.

wireless-regdb can be built from source, when it does so it generates a new custom key which is installed to /lib/crda/pubkeys/<key>. Your key is also installed here, oh but hang on, its also embedded into the binary so why bother installing it at all? Alright, so we can manually move our custom generated key from /lib/crda/pubkeys/<key> to /etc/wireless-regdb/pubkeys/<key> and things will probably be okay next time we build wireless-regdb and upgrade it independently of crda, except for:
1. we now have /lib/crda/pubkeys/linville.pub.pem for no reason at all
2. the distribution is installing to /etc/wireless-regdb/pubkeys/ which should be reserved for the admin
3. you're maintaining a bunch of useless code which embeds openssl data into binaries when you do not have to

These 3 points is what my patch attempts to address.

Thanks, Kel.

#5 lore raw
Quoted 29 lines · On Friday 05 March 2010 11:56:11 Kel Modderman wrote:
Quoted 14 lines · On Friday 05 March 2010 11:37:22 John W. Linville wrote:
Quoted 13 lines · Kel Modderman
Quoted 11 lines · On Friday 05 March 2010 01:31:28 John W. Linville wrote:
Quoted 8 lines · Kel Modderman

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

Quoted 7 lines
Quoted 1 line

No.

Perhaps you could use a few more words? It seems to me that what limits you is the policies of some distributions. Certainly crda and wireless-regdb can be maintained separately so long as the key doesn't change between builds or with alternate keys installed in the proper locations. Am I missing something?

Yes you are missing something. Its not the policy of my distribution which is limiting its the design of the crda/wireless-regdb build systems.

Now that openssl support allows reading pubkeys at runtime, the embedding of crypto data into binaries can be totally removed when built with openssl.

Quoted 12 lines

wireless-regdb can be built from source, when it does so it generates a new custom key which is installed to /lib/crda/pubkeys/<key>. Your key is also installed here, oh but hang on, its also embedded into the binary so why bother installing it at all? Alright, so we can manually move our custom generated key from /lib/crda/pubkeys/<key> to /etc/wireless-regdb/pubkeys/<key> and things will probably be okay next time we build wireless-regdb and upgrade it independently of crda, except for:
1. we now have /lib/crda/pubkeys/linville.pub.pem for no reason at all
2. the distribution is installing to /etc/wireless-regdb/pubkeys/ which should be reserved for the admin
3. you're maintaining a bunch of useless code which embeds openssl data into binaries when you do not have to

4. if your key changes, and we have built and upgraded wireless-regdb and not crda then the embedded crypto data and /lib/crda/pubkeys/linville.pub.pem won't help

Quoted 2 lines

These 3 points is what my patch attempts to address.

4 points

Thanks, Kel.

#6 lore raw
In reply to Kel Modderman
Quoted 19 lines · Kel Modderman
Quoted 10 lines · On Friday 05 March 2010 11:37:22 John W. Linville wrote:
Quoted 9 lines · Kel Modderman
Quoted 7 lines · On Friday 05 March 2010 01:31:28 John W. Linville wrote:
Quoted 3 lines · Kel Modderman

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

Quoted 7 lines
Quoted 1 line

No.

Perhaps you could use a few more words? It seems to me that what limits you is the policies of some distributions. Certainly crda and wireless-regdb can be maintained separately so long as the key doesn't change between builds or with alternate keys installed in the proper locations. Am I missing something?

Quoted 5 lines

Yes you are missing something. Its not the policy of my distribution which is limiting its the design of the crda/wireless-regdb build systems.

Now that openssl support allows reading pubkeys at runtime, the embedding of crypto data into binaries can be totally removed when built with openssl.

I don't think anyone said that this change could not be made. I merely challenged the flawed reasoning you asserted for its need.

Quoted 7 lines

wireless-regdb can be built from source, when it does so it generates a new custom key which is installed to /lib/crda/pubkeys/<key>. Your key is also installed here, oh but hang on, its also embedded into the binary so why bother installing it at all? Alright, so we can manually move our custom generated key from /lib/crda/pubkeys/<key> to /etc/wireless-regdb/pubkeys/<key> and things will probably be okay next time we build wireless-regdb and upgrade it independently of crda, except for:

Why would you need to move it? Did someone break the code that uses regdb_paths in crda.c? Does PUBKEY_DIR not work?

Quoted 1 line

1. we now have /lib/crda/pubkeys/linville.pub.pem for no reason at all

If you don't want my key (or any other) in your binary then simply delete it from crda/pubkeys in your build scripts...?

Quoted 2 lines

2. the distribution is installing to /etc/wireless-regdb/pubkeys/ which should be reserved for the admin

"make PUBKEY_DIR=/lib/crda/pubkeys"?

Quoted 2 lines

3. you're maintaining a bunch of useless code which embeds openssl data into binaries when you do not have to

See rebuttal to #1...just because you don't use some functionality doesn't mean no one else wants it or uses it.

Quoted 1 line

These 3 points is what my patch attempts to address.

It seems to me that you address the points by simply removing functionality rather than using other means that already exist to address the same concerns.

John

Signature · 2 lines
John W. Linville                Someday the world will need a hero, and you
[email protected]                  might be all we have.  Be ready.
#7 lore raw

Hi John,

Quoted 53 lines · On Friday 05 March 2010 14:08:53 John W. Linville wrote:
Quoted 19 lines · Kel Modderman
Quoted 10 lines · On Friday 05 March 2010 11:37:22 John W. Linville wrote:
Quoted 9 lines · Kel Modderman
Quoted 7 lines · On Friday 05 March 2010 01:31:28 John W. Linville wrote:
Quoted 3 lines · Kel Modderman

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

I don't understand -- isn't this possible already?

Quoted 7 lines
Quoted 1 line

No.

Perhaps you could use a few more words? It seems to me that what limits you is the policies of some distributions. Certainly crda and wireless-regdb can be maintained separately so long as the key doesn't change between builds or with alternate keys installed in the proper locations. Am I missing something?

Quoted 5 lines

Yes you are missing something. Its not the policy of my distribution which is limiting its the design of the crda/wireless-regdb build systems.

Now that openssl support allows reading pubkeys at runtime, the embedding of crypto data into binaries can be totally removed when built with openssl.

I don't think anyone said that this change could not be made. I merely challenged the flawed reasoning you asserted for its need.

Quoted 7 lines

wireless-regdb can be built from source, when it does so it generates a new custom key which is installed to /lib/crda/pubkeys/<key>. Your key is also installed here, oh but hang on, its also embedded into the binary so why bother installing it at all? Alright, so we can manually move our custom generated key from /lib/crda/pubkeys/<key> to /etc/wireless-regdb/pubkeys/<key> and things will probably be okay next time we build wireless-regdb and upgrade it independently of crda, except for:

Why would you need to move it? Did someone break the code that uses regdb_paths in crda.c? Does PUBKEY_DIR not work?

Quoted 1 line

1. we now have /lib/crda/pubkeys/linville.pub.pem for no reason at all

If you don't want my key (or any other) in your binary then simply delete it from crda/pubkeys in your build scripts...?

Quoted 2 lines

2. the distribution is installing to /etc/wireless-regdb/pubkeys/ which should be reserved for the admin

"make PUBKEY_DIR=/lib/crda/pubkeys"?

Quoted 2 lines

3. you're maintaining a bunch of useless code which embeds openssl data into binaries when you do not have to

Quoted 8 lines

See rebuttal to #1...just because you don't use some functionality doesn't mean no one else wants it or uses it.

Quoted 1 line

These 3 points is what my patch attempts to address.

It seems to me that you address the points by simply removing functionality rather than using other means that already exist to address the same concerns.

I am obviously having hard time clearly communicating what I think is wrong, so attached is 2 files demonstrating the problem with step by step reproducible commands with output. regdb-upgrade-does-not-work.txt shows the current behaviour which must be improved, regdb-upgrade-does-work.txt shows the behaviour with my patch applied. The patch which was used is also attached.

The steps simulate the independent upgrade/re-installation of wireless-regdb after rebuilding regulatory.bin and signing with a new key. This is a simulation of the expected upgrade path when wireless-regdb and crda are packaged separately and one-time ssl keys are used when building wireless-regdb.

I hope that these logs, along with the patch, help show that I am not removing any current interface from crda, just trying to fix up its current ones.

Thanks, Kel.

When USE_OPENSSL=1 do not embed crypto data into binary, use the PUBKEY_DIR variable just as it is when USE_GCRYPT=1 and just load certs from PUBKEY_DIR for signature verification at runtime. Remove ssl support from utils/key2pub.py.

This allows wireless-regdb to be built from source and upgraded independently of crda and is _crucial_ for distributions who want to build their own regulatory.bin.

When verification fails provide information about the PUBKEY_DIR variable.

Fix typo (s/make noverify/make all_noverify/).

---

Makefile +20 -17
@@ -16,13 +16,6 @@ UDEV_LEVEL=$(CRDA_UDEV_LEVEL)-
 # a different location.
 UDEV_RULE_DIR?=/lib/udev/rules.d/
 
-# If your distribution requires a custom pubkeys dir
-# you must update this variable to reflect where the
-# keys are put when building. For example you can run
-# with make PUBKEY_DIR=/usr/lib/crda/pubkeys
-PUBKEY_DIR?=pubkeys
-RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
-
 CFLAGS += -Wall -g
 
 all: all_noverify verify
@@ -30,17 +23,24 @@ all: all_noverify verify
 all_noverify: crda intersect regdbdump
 
 ifeq ($(USE_OPENSSL),1)
-CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+PUBKEY_DIR?=$(PREFIX)/lib/crda/pubkeys
+RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl`
+CFLAGS += -DPUBKEY_DIR=\"$(PUBKEY_DIR)\" -DALT_PUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\"
 LDLIBS += `pkg-config --libs openssl`
 
-reglib.o: keys-ssl.c
-
 else
+PUBKEY_DIR?=pubkeys
 CFLAGS += -DUSE_GCRYPT
 LDLIBS += -lgcrypt
 
 reglib.o: keys-gcrypt.c
 
+keys-gcrypt.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) $@
+
 endif
 MKDIR ?= mkdir -p
 INSTALL ?= install
@@ -82,15 +82,10 @@ $(REG_BIN):
 	$(NQ) $(REG_GIT)
 	$(NQ)
 	$(NQ) "Once cloned (no need to build) cp regulatory.bin to $(REG_BIN)"
-	$(NQ) "Use \"make noverify\" to disable verification"
+	$(NQ) "Use \"make all_noverify\" to disable verification"
 	$(NQ)
 	$(Q) exit 1
 
-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) $@
-
 %.o: %.c regdb.h
 	$(NQ) '  CC  ' $@
 	$(Q)$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -109,7 +104,15 @@ intersect: reglib.o intersect.o print-re
 
 verify: $(REG_BIN) regdbdump
 	$(NQ) '  CHK  $(REG_BIN)'
-	$(Q)./regdbdump $(REG_BIN) >/dev/null
+	@if ! ./regdbdump $(REG_BIN) >/dev/null; then \
+		echo; \
+		echo "If your distribution requires a custom pubkeys dir you must set"; \
+		echo "PUBKEY_DIR to path where the keys are installed by wireless-regdb."; \
+		echo "For example:"; \
+		echo "    make PUBKEY_DIR=/lib/crda/pubkeys"; \
+		echo; \
+		exit 1; \
+	fi
 
 %.gz: %
 	@$(NQ) ' GZIP' $<
reglib.c +17 -22
@@ -18,10 +18,6 @@
 
 #include "reglib.h"
 
-#ifdef USE_OPENSSL
-#include "keys-ssl.c"
-#endif
-
 #ifdef USE_GCRYPT
 #include "keys-gcrypt.c"
 #endif
@@ -49,7 +45,6 @@ int crda_verify_db_signature(__u8 *db, i
 #ifdef USE_OPENSSL
 	RSA *rsa;
 	__u8 hash[SHA_DIGEST_LENGTH];
-	unsigned int i;
 	int ok = 0;
 	DIR *pubkey_dir;
 	struct dirent *nextfile;
@@ -61,26 +56,26 @@ int crda_verify_db_signature(__u8 *db, i
 		goto out;
 	}
 
-	for (i = 0; (i < sizeof(keys)/sizeof(keys[0])) && (!ok); i++) {
-		rsa = RSA_new();
-		if (!rsa) {
-			fprintf(stderr, "Failed to create RSA key.\n");
-			goto out;
+	if ((pubkey_dir = opendir(PUBKEY_DIR))) {
+		while (!ok && (nextfile = readdir(pubkey_dir))) {
+			snprintf(filename, PATH_MAX, "%s/%s", PUBKEY_DIR,
+				nextfile->d_name);
+			if ((keyfile = fopen(filename, "rb"))) {
+				rsa = PEM_read_RSA_PUBKEY(keyfile,
+					NULL, NULL, NULL);
+				if (rsa)
+					ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
+						db + dblen, siglen, rsa) == 1;
+				RSA_free(rsa);
+				fclose(keyfile);
+			}
 		}
-
-		rsa->e = &keys[i].e;
-		rsa->n = &keys[i].n;
-
-		ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
-				db + dblen, siglen, rsa) == 1;
-
-		rsa->e = NULL;
-		rsa->n = NULL;
-		RSA_free(rsa);
+		closedir(pubkey_dir);
 	}
-	if (!ok && (pubkey_dir = opendir(PUBKEY_DIR))) {
+
+	if (!ok && (pubkey_dir = opendir(ALT_PUBKEY_DIR))) {
 		while (!ok && (nextfile = readdir(pubkey_dir))) {
-			snprintf(filename, PATH_MAX, "%s/%s", PUBKEY_DIR,
+			snprintf(filename, PATH_MAX, "%s/%s", ALT_PUBKEY_DIR,
 				nextfile->d_name);
 			if ((keyfile = fopen(filename, "rb"))) {
 				rsa = PEM_read_RSA_PUBKEY(keyfile,
utils/key2pub.py +5 -94

118 lines not on this page · raw message

# wget -q -O/tmp/wireless-regdb-2009.11.25.tar.bz2 http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-2009.11.25.tar.bz2    
# wget -q -O/tmp/crda-1.1.1.tar.bz2 http://wireless.kernel.org/download/crda/crda-1.1.1.tar.bz2                                            
# tar -C /tmp -xjf /tmp/wireless-regdb-2009.11.25.tar.bz2                                                                                  
# make -C /tmp/wireless-regdb-2009.11.25 all                                                                                               
make: Entering directory `/tmp/wireless-regdb-2009.11.25'                                                                                  
Generating private key for root...                                                                                                         
openssl genrsa -out ~/.wireless-regdb-root.key.priv.pem 2048                                                                               
Generating RSA private key, 2048 bit long modulus                                                                                          
...................................................................................................................................................................................+++                                                                                                    
................................................................+++                                                                          
e is 65537 (0x10001)                                                                                                                         
Generating public key for root...                                                                                                            
openssl rsa -in ~/.wireless-regdb-root.key.priv.pem -out root.key.pub.pem -pubout -outform PEM                                               
writing RSA key                                                                                                                              
Generating regulatory.bin digitally signed by root...                                                                                        
./db2bin.py regulatory.bin db.txt ~/.wireless-regdb-root.key.priv.pem                                                                        
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'                                                                                     
# make -C /tmp/wireless-regdb-2009.11.25 install                                                                                             
make: Entering directory `/tmp/wireless-regdb-2009.11.25'                                                                                    
gzip < regulatory.bin.5 > regulatory.bin.5.gz                                                                                                
install -m 755 -d //usr/lib/crda                                                                                                             
install -m 755 -d //usr/lib/crda/pubkeys                                                                                                     
if [ -f .custom ]; then \                                                                                                                    
                install -m 644 -t //usr/lib/crda/pubkeys/ root.key.pub.pem; \                                                                
        fi                                                                                                                                   
install -m 644 -t //usr/lib/crda/pubkeys/ linville.key.pub.pem                                                                               
install -m 644 -t //usr/lib/crda/ regulatory.bin                                                                                             
install -m 755 -d //usr/share/man//man5/                                                                                                     
install -m 644 -t //usr/share/man//man5/ regulatory.bin.5.gz                                                                                 
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'                                                                                     
# tar -C /tmp -xjf /tmp/crda-1.1.1.tar.bz2                                                                                                   
# make -C /tmp/crda-1.1.1 all USE_OPENSSL=1 PUBKEY_DIR=/usr/lib/crda/pubkeys/                                                                
make: Entering directory `/tmp/crda-1.1.1'                                                                                                   
  GEN  keys-ssl.c                                                                                                                            
  Trusted pubkeys: /usr/lib/crda/pubkeys//linville.key.pub.pem /usr/lib/crda/pubkeys//root.key.pub.pem                                       
  CC   reglib.o                                                                                                                              
  CC   crda.o                                                                                                                                
  LD   crda                                                                                                                                  
  CC   intersect.o                                                                                                                           
  CC   print-regdom.o                                                                                                                        
  LD   intersect                                                                                                                             
  CC   regdbdump.o                                                                                                                           
  LD   regdbdump
  CHK  /usr/lib/crda/regulatory.bin
make: Leaving directory `/tmp/crda-1.1.1'
# make -C /tmp/crda-1.1.1 install USE_OPENSSL=1 PUBKEY_DIR=/usr/lib/crda/pubkeys/
make: Entering directory `/tmp/crda-1.1.1'
 GZIP crda.8
 GZIP regdbdump.8
  INSTALL  crda
  INSTALL  regdbdump
  INSTALL  85-regulatory.rules
  INSTALL  crda.8.gz
  INSTALL  regdbdump.8.gz
make: Leaving directory `/tmp/crda-1.1.1'
# rm -v /root/.wireless-regdb-root.key.priv.pem
removed `/root/.wireless-regdb-root.key.priv.pem'
# make -C /tmp/wireless-regdb-2009.11.25 all
make: Entering directory `/tmp/wireless-regdb-2009.11.25'
Generating private key for root...
openssl genrsa -out ~/.wireless-regdb-root.key.priv.pem 2048
Generating RSA private key, 2048 bit long modulus
...........................+++
.....................................+++
e is 65537 (0x10001)
Generating public key for root...
openssl rsa -in ~/.wireless-regdb-root.key.priv.pem -out root.key.pub.pem -pubout -outform PEM
writing RSA key
Generating regulatory.bin digitally signed by root...
./db2bin.py regulatory.bin db.txt ~/.wireless-regdb-root.key.priv.pem
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'
# make -C /tmp/wireless-regdb-2009.11.25 install
make: Entering directory `/tmp/wireless-regdb-2009.11.25'
gzip < regulatory.bin.5 > regulatory.bin.5.gz
install -m 755 -d //usr/lib/crda
install -m 755 -d //usr/lib/crda/pubkeys
if [ -f .custom ]; then \
                install -m 644 -t //usr/lib/crda/pubkeys/ root.key.pub.pem; \
        fi
install -m 644 -t //usr/lib/crda/pubkeys/ linville.key.pub.pem
install -m 644 -t //usr/lib/crda/ regulatory.bin
install -m 755 -d //usr/share/man//man5/
install -m 644 -t //usr/share/man//man5/ regulatory.bin.5.gz
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'
# regdbdump /usr/lib/crda/regulatory.bin
Database signature verification failed.
# wget -q -O/tmp/wireless-regdb-2009.11.25.tar.bz2 http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-2009.11.25.tar.bz2      
# wget -q -O/tmp/crda-1.1.1.tar.bz2 http://wireless.kernel.org/download/crda/crda-1.1.1.tar.bz2                                              
# tar -C /tmp -xjf /tmp/wireless-regdb-2009.11.25.tar.bz2                                                                                    
# make -C /tmp/wireless-regdb-2009.11.25 all                                                                                                 
make: Entering directory `/tmp/wireless-regdb-2009.11.25'                                                                                    
Generating private key for root...                                                                                                           
openssl genrsa -out ~/.wireless-regdb-root.key.priv.pem 2048                                                                                 
Generating RSA private key, 2048 bit long modulus                                                                                            
..............+++                                                                                                                            
....................................................................................................................................................................................+++                                                                                                   
e is 65537 (0x10001)                                                                                                                         
Generating public key for root...                                                                                                            
openssl rsa -in ~/.wireless-regdb-root.key.priv.pem -out root.key.pub.pem -pubout -outform PEM                                               
writing RSA key                                                                                                                              
Generating regulatory.bin digitally signed by root...                                                                                        
./db2bin.py regulatory.bin db.txt ~/.wireless-regdb-root.key.priv.pem                                                                        
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'                                                                                     
# make -C /tmp/wireless-regdb-2009.11.25 install                                                                                             
make: Entering directory `/tmp/wireless-regdb-2009.11.25'                                                                                    
gzip < regulatory.bin.5 > regulatory.bin.5.gz                                                                                                
install -m 755 -d //usr/lib/crda                                                                                                             
install -m 755 -d //usr/lib/crda/pubkeys                                                                                                     
if [ -f .custom ]; then \                                                                                                                    
                install -m 644 -t //usr/lib/crda/pubkeys/ root.key.pub.pem; \                                                                
        fi                                                                                                                                   
install -m 644 -t //usr/lib/crda/pubkeys/ linville.key.pub.pem                                                                               
install -m 644 -t //usr/lib/crda/ regulatory.bin                                                                                             
install -m 755 -d //usr/share/man//man5/                                                                                                     
install -m 644 -t //usr/share/man//man5/ regulatory.bin.5.gz                                                                                 
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'                                                                                     
# tar -C /tmp -xjf /tmp/crda-1.1.1.tar.bz2                                                                                                   
# wget -q -O/tmp/crda.patch http://users.tpg.com.au/sigm/patches/openssl_runtime_verification_tuneup.patch                                   
# patch -d /tmp/crda-1.1.1 -p1 -i /tmp/crda.patch                                                                                            
patching file Makefile                                                                                                                       
patching file reglib.c                                                                                                                       
patching file utils/key2pub.py                                                                                                               
# make -C /tmp/crda-1.1.1 all USE_OPENSSL=1                                                                                                  
make: Entering directory `/tmp/crda-1.1.1'                                                                                                   
  CC   reglib.o                                                                                                                              
  CC   crda.o                                                                                                                                
  LD   crda                                                                                                                                  
  CC   intersect.o                                                                                                                           
  CC   print-regdom.o                                                                                                                        
  LD   intersect                                                                                                                             
  CC   regdbdump.o                                                                                                                           
  LD   regdbdump                                                                                                                             
  CHK  /usr/lib/crda/regulatory.bin                                                                                                          
make: Leaving directory `/tmp/crda-1.1.1'                                                                                                    
# make -C /tmp/crda-1.1.1 install USE_OPENSSL=1                                                                                              
make: Entering directory `/tmp/crda-1.1.1'                                                                                                   
 GZIP crda.8                                                                                                                                 
 GZIP regdbdump.8                                                                                                                            
  INSTALL  crda                                                                                                                              
  INSTALL  regdbdump                                                                                                                         
  INSTALL  85-regulatory.rules                                                                                                               
  INSTALL  crda.8.gz                                                                                                                         
  INSTALL  regdbdump.8.gz                                                                                                                    
make: Leaving directory `/tmp/crda-1.1.1'                                                                                                    
# rm -v /root/.wireless-regdb-root.key.priv.pem                                                                                              
removed `/root/.wireless-regdb-root.key.priv.pem'                                                                                            
# make -C /tmp/wireless-regdb-2009.11.25 all                                                                                                 
make: Entering directory `/tmp/wireless-regdb-2009.11.25'                                                                                    
Generating private key for root...                                                                                                           
openssl genrsa -out ~/.wireless-regdb-root.key.priv.pem 2048                                                                                 
Generating RSA private key, 2048 bit long modulus                                                                                            
.....................................+++                                                                                                     
.........................+++                                                                                                                 
e is 65537 (0x10001)                                                                                                                         
Generating public key for root...                                                                                                            
openssl rsa -in ~/.wireless-regdb-root.key.priv.pem -out root.key.pub.pem -pubout -outform PEM                                               
writing RSA key                                                                                                                              
Generating regulatory.bin digitally signed by root...                                                                                        
./db2bin.py regulatory.bin db.txt ~/.wireless-regdb-root.key.priv.pem                                                                        
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'                                                                                     
# make -C /tmp/wireless-regdb-2009.11.25 install                                                                                             
make: Entering directory `/tmp/wireless-regdb-2009.11.25'                                                                                    
gzip < regulatory.bin.5 > regulatory.bin.5.gz                                                                                                
install -m 755 -d //usr/lib/crda                                                                                                             
install -m 755 -d //usr/lib/crda/pubkeys                                                                                                     
if [ -f .custom ]; then \                                                                                                                    
                install -m 644 -t //usr/lib/crda/pubkeys/ root.key.pub.pem; \                                                                
        fi                                                                                                                                   
install -m 644 -t //usr/lib/crda/pubkeys/ linville.key.pub.pem                                                                               
install -m 644 -t //usr/lib/crda/ regulatory.bin                                                                                             
install -m 755 -d //usr/share/man//man5/                                                                                                     
install -m 644 -t //usr/share/man//man5/ regulatory.bin.5.gz                                                                                 
make: Leaving directory `/tmp/wireless-regdb-2009.11.25'                                                                                     
# regdbdump /usr/lib/crda/regulatory.bin                                                                                                     
country 00:                                                                                                                                  
        (2402.000 - 2472.000 @ 40.000), (3.00, 20.00)                                                                                        
        (2457.000 - 2482.000 @ 20.000), (3.00, 20.00), PASSIVE-SCAN, NO-IBSS                                                                 
        (2474.000 - 2494.000 @ 20.000), (3.00, 20.00), NO-OFDM, PASSIVE-SCAN, NO-IBSS                                                        
        (5170.000 - 5250.000 @ 40.000), (3.00, 20.00), PASSIVE-SCAN, NO-IBSS                                                                 
        (5735.000 - 5835.000 @ 40.000), (3.00, 20.00), PASSIVE-SCAN, NO-IBSS
...
#8 lore raw
Quoted 1 line · Kel Modderman

I am obviously having hard time clearly communicating what I think is wrong,

Yes.

Quoted 4 lines

so attached is 2 files demonstrating the problem with step by step reproducible commands with output. regdb-upgrade-does-not-work.txt shows the current behaviour which must be improved, regdb-upgrade-does-work.txt shows the behaviour with my patch applied. The patch which was used is also attached.

That isn't helping, we don't want to do your work of digging through :)

The building-in keys code should NOT be removed, it should be possible to build in keys AND use external keys (and I still think the external key code should be optional since it is _quite_ different from internal keys).

What exactly happens when you build in keys and use external ones? The code I originally wrote should try to validate the database using all available keys, it seems like that was broken and you're trying to fix the symptom rather than the cause.

johannes

#9 lore raw
Quoted 11 lines · On Monday 08 March 2010 18:08:55 Johannes Berg wrote:
Quoted 1 line · Kel Modderman

I am obviously having hard time clearly communicating what I think is wrong,

Yes.

Quoted 4 lines

so attached is 2 files demonstrating the problem with step by step reproducible commands with output. regdb-upgrade-does-not-work.txt shows the current behaviour which must be improved, regdb-upgrade-does-work.txt shows the behaviour with my patch applied. The patch which was used is also attached.

Quoted 6 lines

That isn't helping, we don't want to do your work of digging through :)

The building-in keys code should NOT be removed, it should be possible to build in keys AND use external keys (and I still think the external key code should be optional since it is _quite_ different from internal keys).

I'd prefer to use external keys only. If the correct paths are searched I don't see any need to embed the pubkey data into binary.

Quoted 6 lines

What exactly happens when you build in keys and use external ones? The code I originally wrote should try to validate the database using all available keys, it seems like that was broken and you're trying to fix the symptom rather than the cause.

I fucked up the subject and got two issues all mixed up. The issue which is most important is that crda should search PUBKEY_DIR (eg. /lib/crda/pubkeys) as well as the so called RUNTIME_PUBKEY_DIR (/etc/wireless-regdb/pubkeys) because when wireless-regdb is updated it will install any new custom pubkeys to PUBKEY_DIR and crda is still able to verify the new regulatory.bin after loading the new pubkey at runtime. Attached a new patch.

Thanks, Kel.

Makefile +2 -1
@@ -30,7 +30,8 @@ all: all_noverify verify
 all_noverify: crda intersect regdbdump
 
 ifeq ($(USE_OPENSSL),1)
-CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+CFLAGS += -DPUBKEY_DIR=\"$(PUBKEY_DIR)\" -DRUNTIME_PUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\"
+CFLAGS += -DUSE_OPENSSL `pkg-config --cflags openssl`
 LDLIBS += `pkg-config --libs openssl`
 
 reglib.o: keys-ssl.c
reglib.c +40 -20

78 lines not on this page · raw message

---