summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2001-12-15 10:23:37 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2001-12-15 10:23:37 +0000
commit4d59207240394ff9bcc951fa919163db7f1739d1 (patch)
tree21db9ed3585fb1719962038b939f51d8251757b0
parent25c04f4a4983a23b11bccd40f035b2c398f6de0a (diff)
downloadgnutls-4d59207240394ff9bcc951fa919163db7f1739d1.tar.gz
*** empty log message ***
-rw-r--r--.cvsusers4
-rw-r--r--lib/gnutls.h.in2
-rw-r--r--lib/gnutls_srp.c4
-rw-r--r--src/serv.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/.cvsusers b/.cvsusers
index c7269a9039..417123c2bd 100644
--- a/.cvsusers
+++ b/.cvsusers
@@ -1,3 +1,3 @@
wkoch:wk@gnupg.org
-nmav:nmav@hellug.gr
-fiorinaf:Fabio.Fiorina@alcatel.it
+nmav:nmav@gnutls.org
+fiorinaf:ffiorina@gnutls.org
diff --git a/lib/gnutls.h.in b/lib/gnutls.h.in
index 92301cfead..d0a5e87854 100644
--- a/lib/gnutls.h.in
+++ b/lib/gnutls.h.in
@@ -187,7 +187,7 @@ int gnutls_srp_set_client_cred( SRP_CLIENT_CREDENTIALS res, char *username, char
void gnutls_srp_free_server_sc( SRP_SERVER_CREDENTIALS sc);
int gnutls_srp_allocate_server_sc( SRP_SERVER_CREDENTIALS *sc);
-int gnutls_srp_set_server_cred( SRP_SERVER_CREDENTIALS res, char *password_file, char* password_conf_file);
+int gnutls_srp_set_server_cred_file( SRP_SERVER_CREDENTIALS res, char *password_file, char* password_conf_file);
void gnutls_anon_free_server_sc( ANON_SERVER_CREDENTIALS sc);
int gnutls_anon_allocate_server_sc( ANON_SERVER_CREDENTIALS *sc);
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index 31fa8600cd..4b9917f706 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -387,13 +387,13 @@ int gnutls_srp_allocate_server_sc( SRP_SERVER_CREDENTIALS *sc) {
}
/**
- * gnutls_srp_set_server_cred - Used to set the password files, in a SRP_SERVER_CREDENTIALS structure
+ * gnutls_srp_set_server_cred_file - Used to set the password files, in a SRP_SERVER_CREDENTIALS structure
* @res: is an &SRP_SERVER_CREDENTIALS structure.
* @password_file: is the SRP password file (tpasswd)
* @password_conf_file: is the SRP password conf file (tpasswd.conf)
*
**/
-int gnutls_srp_set_server_cred( SRP_SERVER_CREDENTIALS res, char *password_file, char * password_conf_file) {
+int gnutls_srp_set_server_cred_file( SRP_SERVER_CREDENTIALS res, char *password_file, char * password_conf_file) {
res->password_file = gnutls_strdup( password_file);
if (res->password_file==NULL) return GNUTLS_E_MEMORY_ERROR;
diff --git a/src/serv.c b/src/serv.c
index 7b43ae9daf..1206a83d5c 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -368,7 +368,7 @@ int main(int argc, char **argv)
* Read README.crypt prior to using SRP.
*/
gnutls_srp_allocate_server_sc( &srp_cred);
- gnutls_srp_set_server_cred( srp_cred, SRP_PASSWD, SRP_PASSWD_CONF);
+ gnutls_srp_set_server_cred_file( srp_cred, SRP_PASSWD, SRP_PASSWD_CONF);
gnutls_anon_allocate_server_sc( &dh_cred);
gnutls_anon_set_server_cred( dh_cred, 1024);