X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyindex.c;h=c656bd142e9f7f500965c182bdecb3b6c83d3c6b;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=4dbb07414667a11921a7b870d20769342d821332;hpb=5cb3cfdb9d8caa6d7a4a1979c50c46896957b934;p=onak.git

diff --git a/keyindex.c b/keyindex.c
index 4dbb074..c656bd1 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <inttypes.h>
@@ -26,14 +25,12 @@
 
 #include "decodekey.h"
 #include "getcgi.h"
-#include "hash.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.h"
 #include "onak.h"
-#include "onak-conf.h"
 #include "openpgp.h"
 
 /*
@@ -48,6 +45,7 @@ char pkalgo2char(uint8_t algo)
 		typech = 'D';
 		break;
 	case OPENPGP_PKALGO_ECDSA:
+	case OPENPGP_PKALGO_EDDSA:
 		typech = 'E';
 		break;
 	case OPENPGP_PKALGO_EC:
@@ -93,8 +91,35 @@ unsigned int keylength(struct openpgp_packet *keydata)
 		switch (keydata->data[5]) {
 		case OPENPGP_PKALGO_EC:
 		case OPENPGP_PKALGO_ECDSA:
+		case OPENPGP_PKALGO_EDDSA:
 			/* Elliptic curve key size is based on OID */
-			if ((keydata->data[6] == 8) &&
+			/* Curve25519 / 1.3.6.1.4.1.3029.1.5.1 */
+			if ((keydata->data[6] == 10) &&
+					(keydata->data[7] == 0x2B) &&
+					(keydata->data[8] == 0x06) &&
+					(keydata->data[9] == 0x01) &&
+					(keydata->data[10] == 0x04) &&
+					(keydata->data[11] == 0x01) &&
+					(keydata->data[12] == 0x97) &&
+					(keydata->data[13] == 0x55) &&
+					(keydata->data[14] == 0x01) &&
+					(keydata->data[15] == 0x05) &&
+					(keydata->data[16] == 0x01)) {
+				length = 255;
+			/* Ed25519 / 1.3.6.1.4.1.11591.15.1 */
+			} else if ((keydata->data[6] == 9) &&
+					(keydata->data[7] == 0x2B) &&
+					(keydata->data[8] == 0x06) &&
+					(keydata->data[9] == 0x01) &&
+					(keydata->data[10] == 0x04) &&
+					(keydata->data[11] == 0x01) &&
+					(keydata->data[12] == 0xDA) &&
+					(keydata->data[13] == 0x47) &&
+					(keydata->data[14] == 0x0F) &&
+					(keydata->data[15] == 0x01)) {
+				length = 255;
+			/* nistp256 / 1.2.840.10045.3.1.7 */
+			} else if ((keydata->data[6] == 8) &&
 					(keydata->data[7] == 0x2A) &&
 					(keydata->data[8] == 0x86) &&
 					(keydata->data[9] == 0x48) &&
@@ -104,6 +129,7 @@ unsigned int keylength(struct openpgp_packet *keydata)
 					(keydata->data[13] == 0x01) &&
 					(keydata->data[14] == 0x07)) {
 				length = 256;
+			/* nistp384 / 1.3.132.0.34 */
 			} else if ((keydata->data[6] == 5) &&
 					(keydata->data[7] == 0x2B) &&
 					(keydata->data[8] == 0x81) &&
@@ -111,6 +137,7 @@ unsigned int keylength(struct openpgp_packet *keydata)
 					(keydata->data[10] == 0x00) &&
 					(keydata->data[11] == 0x22)) {
 				length = 384;
+			/* nistp521 / 1.3.132.0.35 */
 			} else if ((keydata->data[6] == 5) &&
 					(keydata->data[7] == 0x2B) &&
 					(keydata->data[8] == 0x81) &&
@@ -118,6 +145,50 @@ unsigned int keylength(struct openpgp_packet *keydata)
 					(keydata->data[10] == 0x00) &&
 					(keydata->data[11] == 0x23)) {
 				length = 521;
+			/* brainpoolP256r1 / 1.3.36.3.3.2.8.1.1.7 */
+			} else if ((keydata->data[6] == 9) &&
+					(keydata->data[7] == 0x2B) &&
+					(keydata->data[8] == 0x24) &&
+					(keydata->data[9] == 0x03) &&
+					(keydata->data[10] == 0x03) &&
+					(keydata->data[11] == 0x02) &&
+					(keydata->data[12] == 0x08) &&
+					(keydata->data[13] == 0x01) &&
+					(keydata->data[14] == 0x01) &&
+					(keydata->data[15] == 0x07)) {
+				length = 256;
+			/* brainpoolP384r1 / 1.3.36.3.3.2.8.1.1.11 */
+			} else if ((keydata->data[6] == 9) &&
+					(keydata->data[7] == 0x2B) &&
+					(keydata->data[8] == 0x24) &&
+					(keydata->data[9] == 0x03) &&
+					(keydata->data[10] == 0x03) &&
+					(keydata->data[11] == 0x02) &&
+					(keydata->data[12] == 0x08) &&
+					(keydata->data[13] == 0x01) &&
+					(keydata->data[14] == 0x01) &&
+					(keydata->data[15] == 0x0B)) {
+				length = 384;
+			/* brainpoolP512r1 / 1.3.36.3.3.2.8.1.1.13 */
+			} else if ((keydata->data[6] == 9) &&
+					(keydata->data[7] == 0x2B) &&
+					(keydata->data[8] == 0x24) &&
+					(keydata->data[9] == 0x03) &&
+					(keydata->data[10] == 0x03) &&
+					(keydata->data[11] == 0x02) &&
+					(keydata->data[12] == 0x08) &&
+					(keydata->data[13] == 0x01) &&
+					(keydata->data[14] == 0x01) &&
+					(keydata->data[15] == 0x0D)) {
+				length = 512;
+			/* secp256k1 / 1.3.132.0.10 */
+			} else if ((keydata->data[6] == 5) &&
+					(keydata->data[7] == 0x2B) &&
+					(keydata->data[8] == 0x81) &&
+					(keydata->data[9] == 0x04) &&
+					(keydata->data[10] == 0x00) &&
+					(keydata->data[11] == 0x0A)) {
+				length = 256;
 			} else {
 				logthing(LOGTHING_ERROR,
 					"Unknown elliptic curve size");