Turn a number of #defines into proper functions with prototypes matching

those that OpenSSL has had for ages.

ok jsing

1 files changed, 13 insertions, 1 deletions

diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
index becdaf6ce5..1a4b583ab7 100644
--- a/src/lib/libcrypto/x509/x509_set.c
+++ b/src/lib/libcrypto/x509/x509_set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_set.c,v 1.16 2018/02/22 17:09:28 jsing Exp $ */
+/* $OpenBSD: x509_set.c,v 1.17 2018/08/24 19:55:58 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -87,6 +87,12 @@ X509_set_version(X509 *x, long version)
         return (ASN1_INTEGER_set(x->cert_info->version, version));
 }
 
+long
+X509_get_version(const X509 *x)
+{
+        return ASN1_INTEGER_get(x->cert_info->version);
+}
+
 int
 X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
 {
@@ -204,3 +210,9 @@ X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
                 return (0);
         return (X509_PUBKEY_set(&(x->cert_info->key), pkey));
 }
+
+int
+X509_get_signature_type(const X509 *x)
+{
+        return EVP_PKEY_type(OBJ_obj2nid(x->sig_alg->algorithm));
+}