From 32ce69092e03f59229dec1bcc32c2cd591982f78 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 17 Dec 2015 11:19:18 +0200 Subject: [PATCH] TLS: Share digest OID checkers from X.509 These will be used by the OCSP implementation. Signed-off-by: Jouni Malinen --- src/tls/x509v3.c | 8 ++++---- src/tls/x509v3.h | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c index 9f3959799..c8085c904 100644 --- a/src/tls/x509v3.c +++ b/src/tls/x509v3.c @@ -1553,7 +1553,7 @@ static int x509_digest_oid(struct asn1_oid *oid) } -static int x509_sha1_oid(struct asn1_oid *oid) +int x509_sha1_oid(struct asn1_oid *oid) { return oid->len == 6 && oid->oid[0] == 1 /* iso */ && @@ -1579,21 +1579,21 @@ static int x509_sha2_oid(struct asn1_oid *oid) } -static int x509_sha256_oid(struct asn1_oid *oid) +int x509_sha256_oid(struct asn1_oid *oid) { return x509_sha2_oid(oid) && oid->oid[8] == 1 /* sha256 */; } -static int x509_sha384_oid(struct asn1_oid *oid) +int x509_sha384_oid(struct asn1_oid *oid) { return x509_sha2_oid(oid) && oid->oid[8] == 2 /* sha384 */; } -static int x509_sha512_oid(struct asn1_oid *oid) +int x509_sha512_oid(struct asn1_oid *oid) { return x509_sha2_oid(oid) && oid->oid[8] == 3 /* sha512 */; diff --git a/src/tls/x509v3.h b/src/tls/x509v3.h index 9cd904afa..3e97313f4 100644 --- a/src/tls/x509v3.h +++ b/src/tls/x509v3.h @@ -142,4 +142,9 @@ x509_certificate_get_subject(struct x509_certificate *chain, struct x509_name *name); int x509_certificate_self_signed(struct x509_certificate *cert); +int x509_sha1_oid(struct asn1_oid *oid); +int x509_sha256_oid(struct asn1_oid *oid); +int x509_sha384_oid(struct asn1_oid *oid); +int x509_sha512_oid(struct asn1_oid *oid); + #endif /* X509V3_H */