renamed cert_sb64.c to auth_srp_sb64.c (since it is only used in SRP KX)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b7eb51c132769153a561369ed59d1ea397c2e140..1722f4c76d3f398fe52dcd0c9c502fedc5e040d3 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,5 +21,5 @@ libgnutls_la_SOURCES = gnutls.c gnutls_compress.c debug.c gnutls_plaintext.c \
        gnutls_compress_int.c gnutls_session.c gnutls_db.c cert_b64.c \
        auth_anon.c auth_dhe_dss.c gnutls_extensions.c ext_srp.c gnutls_auth.c \
        crypt_bcrypt.c crypt.c gnutls_random.c crypt_srpsha1.c gnutls_srp.c \
-       auth_srp.c auth_srp_passwd.c gnutls_v2_compat.c cert_sb64.c
+       auth_srp.c auth_srp_passwd.c gnutls_v2_compat.c auth_srp_sb64.c
 libgnutls_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

diff --git a/lib/auth_srp_passwd.h b/lib/auth_srp_passwd.h
index 77e0c0cd1becef9df8ba0a1a21bacc85a31977a3..3bec65f61f7f294e47783e98bd511a3a2a970c07 100644 (file)
--- a/lib/auth_srp_passwd.h
+++ b/lib/auth_srp_passwd.h
@@ -14,3 +14,5 @@ typedef struct {
 GNUTLS_SRP_PWD_ENTRY *_gnutls_srp_pwd_read_entry( GNUTLS_KEY key, char* username, int* err);
 void _gnutls_srp_clear_pwd_entry( GNUTLS_SRP_PWD_ENTRY * entry);
 GNUTLS_SRP_PWD_ENTRY* _gnutls_randomize_pwd_entry();
+int _gnutls_sbase64_encode(uint8 * data, int data_size, uint8 ** result);
+int _gnutls_sbase64_decode(uint8 * data, int data_size, uint8 ** result);

diff --git a/lib/cert_sb64.c b/lib/auth_srp_sb64.c
similarity index 100%
rename from lib/cert_sb64.c
rename to lib/auth_srp_sb64.c

diff --git a/lib/cert_b64.h b/lib/cert_b64.h
index d69b6f273c142ec9473907a1fadff7a7cb9a32b9..58d4353044d2f5f489f66824dd8dd87c16ada48c 100644 (file)
--- a/lib/cert_b64.h
+++ b/lib/cert_b64.h
@@ -4,5 +4,3 @@ int _gnutls_fbase64_encode(char *msg, uint8 * data, int data_size,
 int _gnutls_base64_decode(uint8 * data, int data_size, uint8 ** result);
 int _gnutls_fbase64_decode(char *msg, uint8 * data, int data_size,
                           uint8 ** result);
-int _gnutls_sbase64_encode(uint8 * data, int data_size, uint8 ** result);
-int _gnutls_sbase64_decode(uint8 * data, int data_size, uint8 ** result);

diff --git a/lib/crypt_bcrypt.c b/lib/crypt_bcrypt.c
index 46f952f9e7a878189b1d68eda9518833882d07ae..4851d2bd75ab336aed0c39108e48b60058f45201 100644 (file)
--- a/lib/crypt_bcrypt.c
+++ b/lib/crypt_bcrypt.c
@@ -30,7 +30,7 @@
 #include "gnutls_int.h"
 #include "crypt_bcrypt.h"
 #include "gnutls_random.h"
-#include "cert_b64.h"
+#include "auth_srp_passwd.h"
 #include "gnutls_srp.h"
 #include <gnutls_errors.h>
 

diff --git a/lib/crypt_srpsha1.c b/lib/crypt_srpsha1.c
index 91960ac914d87ca2c6083af05c24694f124b62c3..9cd057fd35ed1e93e53cfc134d79bc847d65e57d 100644 (file)
--- a/lib/crypt_srpsha1.c
+++ b/lib/crypt_srpsha1.c
@@ -22,7 +22,7 @@
 #include "gnutls_int.h"
 #include "gnutls_random.h"
 #include "gnutls_hash_int.h"
-#include "cert_b64.h"
+#include "auth_srp_passwd.h"
 #include "gnutls_srp.h"
 #include <gnutls_errors.h>