X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=sigcheck.c;h=0f93a31009c123e77fa0660eba76167bc7b72be7;hb=86936a047acc793ea7abc80b665ee3e4e538143a;hp=e5e8ccde9640e6bce5ce248e0d3d16bf200d9557;hpb=d0fd08fab7a646c47fae21491c8d8f1c2b790a2c;p=onak.git
diff --git a/sigcheck.c b/sigcheck.c
index e5e8ccd..0f93a31 100644
--- a/sigcheck.c
+++ b/sigcheck.c
@@ -13,13 +13,14 @@
* 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 .
*/
#include
-#include "config.h"
+#include "build-config.h"
+#include "decodekey.h"
+#include "keyid.h"
#include "keystructs.h"
#include "log.h"
#include "openpgp.h"
@@ -27,54 +28,54 @@
#ifdef HAVE_NETTLE
#include
+#include
#include
#else
#include "md5.h"
#include "sha1.h"
#endif
+#include "sha1x.h"
-int check_packet_sighash(struct openpgp_publickey *key,
+onak_status_t calculate_packet_sighash(struct openpgp_publickey *key,
struct openpgp_packet *packet,
- struct openpgp_packet *sig)
+ struct openpgp_packet *sig,
+ uint8_t *hashtype,
+ uint8_t *hash,
+ uint8_t **sighash)
{
- uint8_t hashtype;
- uint8_t *sighash;
size_t siglen, unhashedlen;
struct sha1_ctx sha1_context;
+ struct sha1x_ctx sha1x_context;
struct md5_ctx md5_context;
-#ifdef NETTLE_WITH_SHA224
+#ifdef HAVE_NETTLE
+ struct ripemd160_ctx ripemd160_context;
struct sha224_ctx sha224_context;
-#endif
-#ifdef NETTLE_WITH_SHA256
struct sha256_ctx sha256_context;
-#endif
-#ifdef NETTLE_WITH_SHA384
struct sha384_ctx sha384_context;
-#endif
-#ifdef NETTLE_WITH_SHA512
struct sha512_ctx sha512_context;
#endif
- uint8_t keyheader[3];
+ uint8_t keyheader[5];
uint8_t packetheader[5];
- uint8_t v4trailer[6];
- uint8_t hash[20];
+ uint8_t trailer[10];
uint8_t *hashdata[8];
size_t hashlen[8];
int chunks, i;
-
- keyheader[0] = 0x99;
- keyheader[1] = key->publickey->length >> 8;
- keyheader[2] = key->publickey->length & 0xFF;
- hashdata[0] = keyheader;
- hashlen[0] = 3;
- hashdata[1] = key->publickey->data;
- hashlen[1] = key->publickey->length;
- chunks = 2;
+ uint64_t keyid;
+ onak_status_t res;
switch (sig->data[0]) {
case 2:
case 3:
- hashtype = sig->data[16];
+ keyheader[0] = 0x99;
+ keyheader[1] = key->publickey->length >> 8;
+ keyheader[2] = key->publickey->length & 0xFF;
+ hashdata[0] = keyheader;
+ hashlen[0] = 3;
+ hashdata[1] = key->publickey->data;
+ hashlen[1] = key->publickey->length;
+ chunks = 2;
+
+ *hashtype = sig->data[16];
if (packet != NULL) {
if (packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
@@ -95,10 +96,45 @@ int check_packet_sighash(struct openpgp_publickey *key,
hashdata[chunks] = &sig->data[2];
hashlen[chunks] = 5;
chunks++;
- sighash = &sig->data[17];
+ *sighash = &sig->data[17];
break;
case 4:
- hashtype = sig->data[3];
+ keyheader[0] = 0x99;
+ keyheader[1] = key->publickey->length >> 8;
+ keyheader[2] = key->publickey->length & 0xFF;
+ hashdata[0] = keyheader;
+ hashlen[0] = 3;
+ hashdata[1] = key->publickey->data;
+ hashlen[1] = key->publickey->length;
+ chunks = 2;
+
+ *hashtype = sig->data[3];
+
+ /* Check to see if this is an X509 based signature */
+ if (sig->data[2] == 0 || sig->data[2] == 100) {
+ size_t len;
+
+ keyid = 0;
+ res = parse_subpackets(&sig->data[4],
+ sig->length - 4, &len,
+ &keyid, NULL);
+ if (res != ONAK_E_OK) {
+ return res;
+ }
+ if (keyid == 0 &&
+ /* No unhashed data */
+ sig->data[4 + len] == 0 &&
+ sig->data[5 + len] == 0 &&
+ /* Dummy 0 checksum */
+ sig->data[6 + len] == 0 &&
+ sig->data[7 + len] == 0 &&
+ /* Dummy MPI of 1 */
+ sig->data[8 + len] == 0 &&
+ sig->data[9 + len] == 1 &&
+ sig->data[10 + len] == 1) {
+ return ONAK_E_UNSUPPORTED_FEATURE;
+ }
+ }
if (packet != NULL) {
if (packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
@@ -128,29 +164,99 @@ int check_packet_sighash(struct openpgp_publickey *key,
hashdata[chunks] = sig->data;
hashlen[chunks] = siglen = (sig->data[4] << 8) +
sig->data[5] + 6;;
+ if (siglen > sig->length) {
+ /* Signature data exceed packet length, bogus */
+ return ONAK_E_INVALID_PKT;
+ }
chunks++;
- v4trailer[0] = 4;
- v4trailer[1] = 0xFF;
- v4trailer[2] = siglen >> 24;
- v4trailer[3] = (siglen >> 16) & 0xFF;
- v4trailer[4] = (siglen >> 8) & 0xFF;
- v4trailer[5] = siglen & 0xFF;
- hashdata[chunks] = v4trailer;
+ trailer[0] = 4;
+ trailer[1] = 0xFF;
+ trailer[2] = siglen >> 24;
+ trailer[3] = (siglen >> 16) & 0xFF;
+ trailer[4] = (siglen >> 8) & 0xFF;
+ trailer[5] = siglen & 0xFF;
+ hashdata[chunks] = trailer;
hashlen[chunks] = 6;
chunks++;
unhashedlen = (sig->data[siglen] << 8) +
sig->data[siglen + 1];
- sighash = &sig->data[siglen + unhashedlen + 2];
+ *sighash = &sig->data[siglen + unhashedlen + 2];
+ break;
+ case 5:
+ keyheader[0] = 0x9A;
+ keyheader[1] = 0;
+ keyheader[2] = 0;
+ keyheader[3] = key->publickey->length >> 8;
+ keyheader[4] = key->publickey->length & 0xFF;
+ hashdata[0] = keyheader;
+ hashlen[0] = 5;
+ hashdata[1] = key->publickey->data;
+ hashlen[1] = key->publickey->length;
+ chunks = 2;
+
+ *hashtype = sig->data[3];
+
+ if (packet != NULL) {
+ if (packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
+ packetheader[0] = 0x9A;
+ packetheader[1] = 0;
+ packetheader[2] = 0;
+ packetheader[3] = packet->length >> 8;
+ packetheader[4] = packet->length & 0xFF;
+ hashdata[chunks] = packetheader;
+ hashlen[chunks] = 5;
+ chunks++;
+ } else if (packet->tag == OPENPGP_PACKET_UID ||
+ packet->tag == OPENPGP_PACKET_UAT) {
+ packetheader[0] = (packet->tag ==
+ OPENPGP_PACKET_UID) ? 0xB4 : 0xD1;
+ packetheader[1] = packet->length >> 24;
+ packetheader[2] = (packet->length >> 16) & 0xFF;
+ packetheader[3] = (packet->length >> 8) & 0xFF;
+ packetheader[4] = packet->length & 0xFF;
+ hashdata[chunks] = packetheader;
+ hashlen[chunks] = 5;
+ chunks++;
+ }
+ hashdata[chunks] = packet->data;
+ hashlen[chunks] = packet->length;
+ chunks++;
+ }
+
+ hashdata[chunks] = sig->data;
+ hashlen[chunks] = siglen = (sig->data[4] << 8) +
+ sig->data[5] + 6;;
+ if (siglen > sig->length) {
+ /* Signature data exceed packet length, bogus */
+ return ONAK_E_INVALID_PKT;
+ }
+ chunks++;
+
+ trailer[0] = 5;
+ trailer[1] = 0xFF;
+ trailer[2] = 0;
+ trailer[3] = 0;
+ trailer[4] = 0;
+ trailer[5] = 0;
+ trailer[6] = siglen >> 24;
+ trailer[7] = (siglen >> 16) & 0xFF;
+ trailer[8] = (siglen >> 8) & 0xFF;
+ trailer[9] = siglen & 0xFF;
+ hashdata[chunks] = trailer;
+ hashlen[chunks] = 10;
+ chunks++;
+
+ unhashedlen = (sig->data[siglen] << 8) +
+ sig->data[siglen + 1];
+ *sighash = &sig->data[siglen + unhashedlen + 2];
break;
default:
- logthing(LOGTHING_ERROR, "Unknown signature version %d",
- sig->data[0]);
- return -1;
+ return ONAK_E_UNSUPPORTED_FEATURE;
}
- switch (hashtype) {
+ switch (*hashtype) {
case OPENPGP_HASH_MD5:
md5_init(&md5_context);
for (i = 0; i < chunks; i++) {
@@ -165,8 +271,24 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha1_digest(&sha1_context, 20, hash);
break;
+ case OPENPGP_HASH_SHA1X:
+ sha1x_init(&sha1x_context);
+ for (i = 0; i < chunks; i++) {
+ sha1x_update(&sha1x_context, hashlen[i], hashdata[i]);
+ }
+ sha1x_digest(&sha1x_context, 20, hash);
+ break;
+#ifdef HAVE_NETTLE
+ case OPENPGP_HASH_RIPEMD160:
+ ripemd160_init(&ripemd160_context);
+ for (i = 0; i < chunks; i++) {
+ ripemd160_update(&ripemd160_context, hashlen[i],
+ hashdata[i]);
+ }
+ ripemd160_digest(&ripemd160_context, RIPEMD160_DIGEST_SIZE,
+ hash);
+ break;
case OPENPGP_HASH_SHA224:
-#ifdef NETTLE_WITH_SHA224
sha224_init(&sha224_context);
for (i = 0; i < chunks; i++) {
sha224_update(&sha224_context, hashlen[i],
@@ -174,12 +296,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha224_digest(&sha224_context, SHA224_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA224 support not available.");
- return -1;
-#endif
case OPENPGP_HASH_SHA256:
-#ifdef NETTLE_WITH_SHA256
sha256_init(&sha256_context);
for (i = 0; i < chunks; i++) {
sha256_update(&sha256_context, hashlen[i],
@@ -187,12 +304,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha256_digest(&sha256_context, SHA256_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA256 support not available.");
- return -1;
-#endif
case OPENPGP_HASH_SHA384:
-#ifdef NETTLE_WITH_SHA384
sha384_init(&sha384_context);
for (i = 0; i < chunks; i++) {
sha384_update(&sha384_context, hashlen[i],
@@ -200,12 +312,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha384_digest(&sha384_context, SHA384_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA384 support not available.");
- return -1;
-#endif
case OPENPGP_HASH_SHA512:
-#ifdef NETTLE_WITH_SHA512
sha512_init(&sha512_context);
for (i = 0; i < chunks; i++) {
sha512_update(&sha512_context, hashlen[i],
@@ -213,20 +320,10 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha512_digest(&sha512_context, SHA512_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA512 support not available.");
- return -1;
#endif
default:
- logthing(LOGTHING_ERROR, "Unsupported signature hash type %d",
- hashtype);
- return -1;
+ return ONAK_E_UNSUPPORTED_FEATURE;
}
- logthing(LOGTHING_DEBUG, "Hash type: %d, %d chunks, "
- "calculated: %02X%02X / actual: %02X%02X\n",
- hashtype, chunks,
- hash[0], hash[1], sighash[0], sighash[1]);
-
- return (hash[0] == sighash[0] && hash[1] == sighash[1]);
+ return ONAK_E_OK;
}