Move remaining SRP functions to lib/.

diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h
index 665141944cfdb451b1e49a6a17a8430da2dffc34..ee883a547ec82b3787cd006df578602b7b54c5d3 100644 (file)
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -76,13 +76,4 @@ int gnutls_global_init_extra(void);
  */
 const char* gnutls_extra_check_version( const char *req_version);
 
-/* base64 */
-int gnutls_srp_base64_encode( const gnutls_datum_t *data, char* result, int* result_size);
-int gnutls_srp_base64_encode_alloc( const gnutls_datum_t *data, gnutls_datum_t* result);
-
-int gnutls_srp_base64_decode( const gnutls_datum_t *b64_data, char* result, int* result_size);
-int gnutls_srp_base64_decode_alloc( const gnutls_datum_t *b64_data, 
-   gnutls_datum_t* result);
-
-
 #endif

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 8ba0b81a0ed9895b25f53a6e9d46b43a3e03f30d..01b3031f5ef25efae4e9ae5a326006e466a21905 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -557,3 +557,9 @@ typedef int gnutls_srp_client_credentials_function(gnutls_session_t, unsigned in
 void gnutls_srp_set_client_credentials_function( gnutls_srp_client_credentials_t cred,
     gnutls_srp_client_credentials_function *func);
 
+int gnutls_srp_base64_encode( const gnutls_datum_t *data, char* result, int* result_size);
+int gnutls_srp_base64_encode_alloc( const gnutls_datum_t *data, gnutls_datum_t* result);
+
+int gnutls_srp_base64_decode( const gnutls_datum_t *b64_data, char* result, int* result_size);
+int gnutls_srp_base64_decode_alloc( const gnutls_datum_t *b64_data,
+                                     gnutls_datum_t* result);