export x509_crt_to_raw_pubkey() in x509/common.h and prefixed s/get_extension with...

diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c
index 70b8439981653c399989775787b1b533c425e4c9..c6923435290b87b4ca39e5541a12c4e26c5b36d4 100644 (file)
--- a/lib/verify-tofu.c
+++ b/lib/verify-tofu.c
@@ -43,8 +43,6 @@ struct gnutls_tdb_int {
 
 static int raw_pubkey_to_base64(const gnutls_datum_t * raw,
                                gnutls_datum_t * b64);
-static int x509_crt_to_raw_pubkey(const gnutls_datum_t * cert,
-                                 gnutls_datum_t * rpubkey);
 static int pgp_crt_to_raw_pubkey(const gnutls_datum_t * cert,
                                 gnutls_datum_t * rpubkey);
 static int verify_pubkey(const char *file, const char *host,
@@ -384,8 +382,9 @@ static int raw_pubkey_to_base64(const gnutls_datum_t * raw,
        return 0;
 }
 
-static int x509_crt_to_raw_pubkey(const gnutls_datum_t * cert,
-                                 gnutls_datum_t * rpubkey)
+/* Converts an X.509 certificate to subjectPublicKeyInfo */
+int x509_crt_to_raw_pubkey(const gnutls_datum_t * cert,
+                          gnutls_datum_t * rpubkey)
 {
        gnutls_x509_crt_t crt = NULL;
        gnutls_pubkey_t pubkey = NULL;

diff --git a/lib/x509/common.h b/lib/x509/common.h
index 4a66ab6c50143ce831dde13460a3e4c3d5ffa6ea..044984841f83e6d5993a974921da4b6334f07d44 100644 (file)
--- a/lib/x509/common.h
+++ b/lib/x509/common.h
@@ -196,11 +196,11 @@ _gnutls_check_if_same_cert2(gnutls_x509_crt_t cert1,
 
 time_t _gnutls_x509_generalTime2gtime(const char *ttime);
 
-int get_extension(ASN1_TYPE asn, const char *root,
+int _gnutls_get_extension(ASN1_TYPE asn, const char *root,
                  const char *extension_id, int indx,
                  gnutls_datum_t * ret, unsigned int *_critical);
 
-int set_extension(ASN1_TYPE asn, const char *root,
+int _gnutls_set_extension(ASN1_TYPE asn, const char *root,
                  const char *ext_id,
                  const gnutls_datum_t * ext_data, unsigned int critical);
 
@@ -214,4 +214,7 @@ int _gnutls_copy_data(gnutls_datum_t* str, uint8_t *out, size_t *out_size);
 
 int _san_othername_to_virtual(const char *oid, size_t oid_size);
 
+int x509_crt_to_raw_pubkey(const gnutls_datum_t * cert,
+                          gnutls_datum_t * rpubkey);
+
 #endif

diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index 43dc25714b124db200b83c6fa558c20df9a7b5e8..05c015e8e2827b8cf602c863bd34756b906fa060 100644 (file)
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -34,7 +34,7 @@
 #include <gnutls_datum.h>
 
 int
-get_extension(ASN1_TYPE asn, const char *root,
+_gnutls_get_extension(ASN1_TYPE asn, const char *root,
              const char *extension_id, int indx,
              gnutls_datum_t * ret, unsigned int *_critical)
 {
@@ -155,7 +155,7 @@ _gnutls_x509_crt_get_extension(gnutls_x509_crt_t cert,
                               const char *extension_id, int indx,
                               gnutls_datum_t * data, unsigned int *critical)
 {
-       return get_extension(cert->cert, "tbsCertificate.extensions",
+       return _gnutls_get_extension(cert->cert, "tbsCertificate.extensions",
                             extension_id, indx, data, critical);
 }
 
@@ -191,7 +191,7 @@ _gnutls_x509_crl_get_extension(gnutls_x509_crl_t crl,
                               gnutls_datum_t * data,
                               unsigned int *critical)
 {
-       return get_extension(crl->crl, "tbsCertList.crlExtensions",
+       return _gnutls_get_extension(crl->crl, "tbsCertList.crlExtensions",
                             extension_id, indx, data, critical);
 }
 
@@ -415,7 +415,7 @@ overwrite_extension(ASN1_TYPE asn, const char *root, unsigned int indx,
 }
 
 int
-set_extension(ASN1_TYPE asn, const char *root,
+_gnutls_set_extension(ASN1_TYPE asn, const char *root,
              const char *ext_id,
              const gnutls_datum_t * ext_data, unsigned int critical)
 {
@@ -500,7 +500,7 @@ _gnutls_x509_crt_set_extension(gnutls_x509_crt_t cert,
                               const gnutls_datum_t * ext_data,
                               unsigned int critical)
 {
-       return set_extension(cert->cert, "tbsCertificate.extensions",
+       return _gnutls_set_extension(cert->cert, "tbsCertificate.extensions",
                             ext_id, ext_data, critical);
 }
 
@@ -510,7 +510,7 @@ _gnutls_x509_crl_set_extension(gnutls_x509_crl_t crl,
                               const gnutls_datum_t * ext_data,
                               unsigned int critical)
 {
-       return set_extension(crl->crl, "tbsCertList.crlExtensions", ext_id,
+       return _gnutls_set_extension(crl->crl, "tbsCertList.crlExtensions", ext_id,
                             ext_data, critical);
 }
 
@@ -575,7 +575,7 @@ _gnutls_x509_crq_set_extension(gnutls_x509_crq_t crq,
                }
        }
 
-       result = set_extension(c2, "", ext_id, ext_data, critical);
+       result = _gnutls_set_extension(c2, "", ext_id, ext_data, critical);
        if (result < 0) {
                gnutls_assert();
                asn1_delete_structure(&c2);

diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index 7fe5eb103d69a2d95ba055a242ff5fed42fe6278..f82fb684a34b57a115762794b13d820b8841b927 100644 (file)
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -832,7 +832,7 @@ gnutls_ocsp_req_set_extension(gnutls_ocsp_req_t req,
                return GNUTLS_E_INVALID_REQUEST;
        }
 
-       return set_extension(req->req, "tbsRequest.requestExtensions", oid,
+       return _gnutls_set_extension(req->req, "tbsRequest.requestExtensions", oid,
                             data, critical);
 }
 
@@ -862,7 +862,7 @@ gnutls_ocsp_req_get_nonce(gnutls_ocsp_req_t req,
                return GNUTLS_E_INVALID_REQUEST;
        }
 
-       ret = get_extension(req->req, "tbsRequest.requestExtensions",
+       ret = _gnutls_get_extension(req->req, "tbsRequest.requestExtensions",
                            GNUTLS_OCSP_NONCE, 0, &tmp, critical);
        if (ret != GNUTLS_E_SUCCESS) {
                gnutls_assert();
@@ -924,7 +924,7 @@ gnutls_ocsp_req_set_nonce(gnutls_ocsp_req_t req,
        memcpy(dernonce.data + 1, temp, len);
        memcpy(dernonce.data + 1 + len, nonce->data, nonce->size);
 
-       ret = set_extension(req->req, "tbsRequest.requestExtensions",
+       ret = _gnutls_set_extension(req->req, "tbsRequest.requestExtensions",
                            GNUTLS_OCSP_NONCE, &dernonce, critical);
        gnutls_free(dernonce.data);
        if (ret != GNUTLS_E_SUCCESS) {
@@ -1598,7 +1598,7 @@ gnutls_ocsp_resp_get_nonce(gnutls_ocsp_resp_t resp,
        gnutls_datum_t tmp;
 
        ret =
-           get_extension(resp->basicresp,
+           _gnutls_get_extension(resp->basicresp,
                          "tbsResponseData.responseExtensions",
                          GNUTLS_OCSP_NONCE, 0, &tmp, critical);
        if (ret != GNUTLS_E_SUCCESS) {