* 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>
#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"
/*
unsigned int keylength(struct openpgp_packet *keydata)
{
unsigned int length;
+ uint8_t keyofs;
switch (keydata->data[0]) {
case 2:
keydata->data[9];
break;
case 4:
+ case 5:
+ /* v5 has an additional 4 bytes of key length data */
+ keyofs = (keydata->data[0] == 4) ? 6 : 10;
switch (keydata->data[5]) {
case OPENPGP_PKALGO_EC:
case OPENPGP_PKALGO_ECDSA:
case OPENPGP_PKALGO_EDDSA:
/* Elliptic curve key size is based on OID */
/* 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)) {
+ if ((keydata->data[keyofs] == 10) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x06) &&
+ (keydata->data[keyofs + 3] == 0x01) &&
+ (keydata->data[keyofs + 4] == 0x04) &&
+ (keydata->data[keyofs + 5] == 0x01) &&
+ (keydata->data[keyofs + 6] == 0x97) &&
+ (keydata->data[keyofs + 7] == 0x55) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 0x05) &&
+ (keydata->data[keyofs + 10] == 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)) {
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x06) &&
+ (keydata->data[keyofs + 3] == 0x01) &&
+ (keydata->data[keyofs + 4] == 0x04) &&
+ (keydata->data[keyofs + 5] == 0x01) &&
+ (keydata->data[keyofs + 6] == 0xDA) &&
+ (keydata->data[keyofs + 7] == 0x47) &&
+ (keydata->data[keyofs + 8] == 0x0F) &&
+ (keydata->data[keyofs + 9] == 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) &&
- (keydata->data[10] == 0xCE) &&
- (keydata->data[11] == 0x3D) &&
- (keydata->data[12] == 0x03) &&
- (keydata->data[13] == 0x01) &&
- (keydata->data[14] == 0x07)) {
+ } else if ((keydata->data[keyofs] == 8) &&
+ (keydata->data[keyofs + 1] == 0x2A) &&
+ (keydata->data[keyofs + 2] == 0x86) &&
+ (keydata->data[keyofs + 3] == 0x48) &&
+ (keydata->data[keyofs + 4] == 0xCE) &&
+ (keydata->data[keyofs + 5] == 0x3D) &&
+ (keydata->data[keyofs + 6] == 0x03) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x07)) {
length = 256;
/* nistp384 / 1.3.132.0.34 */
- } 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] == 0x22)) {
+ } else if ((keydata->data[keyofs] == 5) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x81) &&
+ (keydata->data[keyofs + 3] == 0x04) &&
+ (keydata->data[keyofs + 4] == 0x00) &&
+ (keydata->data[keyofs + 5] == 0x22)) {
length = 384;
/* nistp521 / 1.3.132.0.35 */
- } 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] == 0x23)) {
+ } else if ((keydata->data[keyofs] == 5) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x81) &&
+ (keydata->data[keyofs + 3] == 0x04) &&
+ (keydata->data[keyofs + 4] == 0x00) &&
+ (keydata->data[keyofs + 5] == 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)) {
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x24) &&
+ (keydata->data[keyofs + 3] == 0x03) &&
+ (keydata->data[keyofs + 4] == 0x03) &&
+ (keydata->data[keyofs + 5] == 0x02) &&
+ (keydata->data[keyofs + 6] == 0x08) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 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)) {
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x24) &&
+ (keydata->data[keyofs + 3] == 0x03) &&
+ (keydata->data[keyofs + 4] == 0x03) &&
+ (keydata->data[keyofs + 5] == 0x02) &&
+ (keydata->data[keyofs + 6] == 0x08) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 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)) {
+ } else if ((keydata->data[keyofs] == 9) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x24) &&
+ (keydata->data[keyofs + 3] == 0x03) &&
+ (keydata->data[keyofs + 4] == 0x03) &&
+ (keydata->data[keyofs + 5] == 0x02) &&
+ (keydata->data[keyofs + 6] == 0x08) &&
+ (keydata->data[keyofs + 7] == 0x01) &&
+ (keydata->data[keyofs + 8] == 0x01) &&
+ (keydata->data[keyofs + 9] == 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)) {
+ } else if ((keydata->data[keyofs] == 5) &&
+ (keydata->data[keyofs + 1] == 0x2B) &&
+ (keydata->data[keyofs + 2] == 0x81) &&
+ (keydata->data[keyofs + 3] == 0x04) &&
+ (keydata->data[keyofs + 4] == 0x00) &&
+ (keydata->data[keyofs + 5] == 0x0A)) {
length = 256;
} else {
logthing(LOGTHING_ERROR,
}
break;
default:
- length = (keydata->data[6] << 8) +
- keydata->data[7];
+ length = (keydata->data[keyofs] << 8) +
+ keydata->data[keyofs + 1];
}
break;
default:
type = subkeys->packet->data[7];
break;
case 4:
+ case 5:
type = subkeys->packet->data[5];
break;
default:
logthing(LOGTHING_ERROR,
- "Unknown key type: %d",
+ "Unknown key version: %d",
subkeys->packet->data[0]);
}
length = keylength(subkeys->packet);
type = keys->publickey->data[7];
break;
case 4:
+ case 5:
type = keys->publickey->data[5];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
keys->publickey->data[0]);
}
length = keylength(keys->publickey);
type = keys->publickey->data[7];
break;
case 4:
+ case 5:
(void) get_fingerprint(keys->publickey, &fingerprint);
for (i = 0; i < fingerprint.length; i++) {
type = keys->publickey->data[5];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ logthing(LOGTHING_ERROR, "Unknown key version: %d",
keys->publickey->data[0]);
}
length = keylength(keys->publickey);
projects / onak.git / blobdiff