]> the.earth.li Git - onak.git/blobdiff - keyindex.c
projects / onak.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add ability to drop overly large packets
[onak.git] / keyindex.c
diff --git a/keyindex.c b/keyindex.c
index 4ca6a413f02642bd1501af78abc7039f91ba74a3..c656bd142e9f7f500965c182bdecb3b6c83d3c6b 100644 (file)
--- 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");
@@ -284,21 +355,21 @@ int list_subkeys(struct onak_dbctx *dbctx,
 void display_fingerprint(struct openpgp_publickey *key)
 {
        int             i = 0;
-       size_t          length = 0;
-       unsigned char   fp[20];
+       struct openpgp_fingerprint fingerprint;
 
-       get_fingerprint(key->publickey, fp, &length);
+       get_fingerprint(key->publickey, &fingerprint);
        printf("      Key fingerprint =");
-       for (i = 0; i < length; i++) {
-               if ((length == 16) ||
+       for (i = 0; i < fingerprint.length; i++) {
+               if ((fingerprint.length == 16) ||
                        (i % 2 == 0)) {
                        printf(" ");
                }
-               if (length == 20 && (i * 2) == length) {
+               if (fingerprint.length == 20 &&
+                               (i * 2) == fingerprint.length) {
                        /* Extra space in the middle of a SHA1 fingerprint */
                        printf(" ");
                }
-               printf("%02X", fp[i]);
+               printf("%02X", fingerprint.fp[i]);
        }
        printf("\n");
 
@@ -464,10 +535,9 @@ int mrkey_index(struct openpgp_publickey *keys)
        int                                      type = 0;
        int                                      length = 0;
        int                                      i = 0;
-       size_t                                   fplength = 0;
-       unsigned char                            fp[20];
        int                                      c;
        uint64_t                                 keyid;
+       struct openpgp_fingerprint fingerprint;
 
        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +
@@ -487,10 +557,10 @@ int mrkey_index(struct openpgp_publickey *keys)
                        type = keys->publickey->data[7];
                        break;
                case 4:
-                       (void) get_fingerprint(keys->publickey, fp, &fplength);
+                       (void) get_fingerprint(keys->publickey, &fingerprint);
 
-                       for (i = 0; i < fplength; i++) {
-                               printf("%02X", fp[i]);
+                       for (i = 0; i < fingerprint.length; i++) {
+                               printf("%02X", fingerprint.fp[i]);
                        }
 
                        type = keys->publickey->data[5];
OpenPGP key server