RSA: Add OID definitions and helper function for hash algorithms

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/tls/asn1.c b/src/tls/asn1.c
index 53acd530d9178724038a9f5427bc6402ab6d347e..97462facb202275100de532f633ffd0917bf0a18 100644 (file)
--- a/src/tls/asn1.c
+++ b/src/tls/asn1.c
@@ -1,6 +1,6 @@
 /*
  * ASN.1 DER parsing
- * Copyright (c) 2006, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2006-2014, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -11,6 +11,17 @@
 #include "common.h"
 #include "asn1.h"
 
+struct asn1_oid asn1_sha1_oid = {
+       .oid = { 1, 3, 14, 3, 2, 26 },
+       .len = 6
+};
+
+struct asn1_oid asn1_sha256_oid = {
+       .oid = { 2, 16, 840, 1, 101, 3, 4, 2, 1 },
+       .len = 9
+};
+
+
 int asn1_get_next(const u8 *buf, size_t len, struct asn1_hdr *hdr)
 {
        const u8 *pos, *end;
@@ -140,7 +151,7 @@ int asn1_get_oid(const u8 *buf, size_t len, struct asn1_oid *oid,
 }
 
 
-void asn1_oid_to_str(struct asn1_oid *oid, char *buf, size_t len)
+void asn1_oid_to_str(const struct asn1_oid *oid, char *buf, size_t len)
 {
        char *pos = buf;
        size_t i;
@@ -204,3 +215,19 @@ unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len)
 
        return val;
 }
+
+
+int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b)
+{
+       size_t i;
+
+       if (a->len != b->len)
+               return 0;
+
+       for (i = 0; i < a->len; i++) {
+               if (a->oid[i] != b->oid[i])
+                       return 0;
+       }
+
+       return 1;
+}

diff --git a/src/tls/asn1.h b/src/tls/asn1.h
index 6342c4cc79fd207a42b67925f1fa460bfdfd1e4b..74750076731de7b86b6340c08f810ec3b372d74a 100644 (file)
--- a/src/tls/asn1.h
+++ b/src/tls/asn1.h
@@ -60,7 +60,11 @@ int asn1_get_next(const u8 *buf, size_t len, struct asn1_hdr *hdr);
 int asn1_parse_oid(const u8 *buf, size_t len, struct asn1_oid *oid);
 int asn1_get_oid(const u8 *buf, size_t len, struct asn1_oid *oid,
                 const u8 **next);
-void asn1_oid_to_str(struct asn1_oid *oid, char *buf, size_t len);
+void asn1_oid_to_str(const struct asn1_oid *oid, char *buf, size_t len);
 unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len);
+int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b);
+
+extern struct asn1_oid asn1_sha1_oid;
+extern struct asn1_oid asn1_sha256_oid;
 
 #endif /* ASN1_H */