diff options
Diffstat (limited to 'subversion/libsvn_ra_svn/cram.c')
| -rw-r--r-- | subversion/libsvn_ra_svn/cram.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/subversion/libsvn_ra_svn/cram.c b/subversion/libsvn_ra_svn/cram.c index 0de85e2..1e54ac8 100644 --- a/subversion/libsvn_ra_svn/cram.c +++ b/subversion/libsvn_ra_svn/cram.c @@ -113,8 +113,8 @@ static void compute_digest(unsigned char *digest, const char *challenge, static svn_error_t *fail(svn_ra_svn_conn_t *conn, apr_pool_t *pool, const char *msg) { - SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "w(c)", "failure", msg)); - return svn_ra_svn_flush(conn, pool); + SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "w(c)", "failure", msg)); + return svn_ra_svn__flush(conn, pool); } /* If we can, make the nonce with random bytes. If we can't... well, @@ -154,10 +154,10 @@ svn_error_t *svn_ra_svn_cram_server(svn_ra_svn_conn_t *conn, apr_pool_t *pool, challenge = apr_psprintf(pool, "<%" APR_UINT64_T_FMT ".%" APR_TIME_T_FMT "@%s>", nonce, apr_time_now(), hostbuf); - SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "w(c)", "step", challenge)); + SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "w(c)", "step", challenge)); /* Read the client's response and decode it into *user and cdigest. */ - SVN_ERR(svn_ra_svn_read_item(conn, pool, &item)); + SVN_ERR(svn_ra_svn__read_item(conn, pool, &item)); if (item->kind != SVN_RA_SVN_STRING) /* Very wrong; don't report failure */ return SVN_NO_ERROR; resp = item->u.string; @@ -176,7 +176,7 @@ svn_error_t *svn_ra_svn_cram_server(svn_ra_svn_conn_t *conn, apr_pool_t *pool, return fail(conn, pool, "Password incorrect"); *success = TRUE; - return svn_ra_svn_write_tuple(conn, pool, "w()", "success"); + return svn_ra_svn__write_tuple(conn, pool, "w()", "success"); } svn_error_t *svn_ra_svn__cram_client(svn_ra_svn_conn_t *conn, apr_pool_t *pool, @@ -188,7 +188,7 @@ svn_error_t *svn_ra_svn__cram_client(svn_ra_svn_conn_t *conn, apr_pool_t *pool, char hex[2 * APR_MD5_DIGESTSIZE + 1]; /* Read the server challenge. */ - SVN_ERR(svn_ra_svn_read_tuple(conn, pool, "w(?c)", &status, &str)); + SVN_ERR(svn_ra_svn__read_tuple(conn, pool, "w(?c)", &status, &str)); if (strcmp(status, "failure") == 0 && str) { *message = str; @@ -203,10 +203,10 @@ svn_error_t *svn_ra_svn__cram_client(svn_ra_svn_conn_t *conn, apr_pool_t *pool, hex_encode(hex, digest); hex[sizeof(hex) - 1] = '\0'; reply = apr_psprintf(pool, "%s %s", user, hex); - SVN_ERR(svn_ra_svn_write_cstring(conn, pool, reply)); + SVN_ERR(svn_ra_svn__write_cstring(conn, pool, reply)); /* Read the success or failure response from the server. */ - SVN_ERR(svn_ra_svn_read_tuple(conn, pool, "w(?c)", &status, &str)); + SVN_ERR(svn_ra_svn__read_tuple(conn, pool, "w(?c)", &status, &str)); if (strcmp(status, "failure") == 0 && str) { *message = str; |