-/* modified by Martin Hedenfalk <mhe@stacken.kth.se> for use in Curl
- * last modified 2000-09-18
- * Even more obscurified to merge better into libcurl by Daniel Stenberg.
- */
-
-/*
+/* This source code was modified by Martin Hedenfalk <mhe@stacken.kth.se> for
+ * use in Curl. His latest changes were done 2000-09-18.
+ *
+ * It has since been patched and modified a lot by Daniel Stenberg
+ * <daniel@haxx.se> to make it better applied to curl conditions, and to make
+ * it not use globals, pollute name space and more. This source code awaits a
+ * rewrite to work around the paragraph 2 in the BSD licenses as explained
+ * below.
+ *
* Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
+ * SUCH DAMAGE. */
#include "setup.h"
return (enum protection_level)-1;
}
-static struct sec_client_mech *mechs[] = {
+static struct Curl_sec_client_mech *mechs[] = {
#ifdef KRB5
- &gss_client_mech,
+ /* not supported */
#endif
#ifdef KRB4
- &krb4_client_mech,
+ &Curl_krb4_client_mech,
#endif
NULL
};
-static struct sec_client_mech *mech;
-
int
-sec_getc(struct connectdata *conn, FILE *F)
+Curl_sec_getc(struct connectdata *conn, FILE *F)
{
if(conn->sec_complete && conn->data_prot) {
char c;
- if(sec_read(conn, fileno(F), &c, 1) <= 0)
+ if(Curl_sec_read(conn, fileno(F), &c, 1) <= 0)
return EOF;
return c;
}
return 0;
else if (b < 0)
return -1;
- buf->size = (*mech->decode)(conn->app_data, buf->data, len,
- conn->data_prot, conn);
+ buf->size = (conn->mech->decode)(conn->app_data, buf->data, len,
+ conn->data_prot, conn);
buf->index = 0;
return 0;
}
}
int
-sec_read(struct connectdata *conn, int fd, void *buffer, int length)
+Curl_sec_read(struct connectdata *conn, int fd, void *buffer, int length)
{
size_t len;
int rx = 0;
{
int bytes;
void *buf;
- bytes = (*mech->encode)(conn->app_data, from, length, conn->data_prot, &buf, conn);
+ bytes = (conn->mech->encode)(conn->app_data, from, length, conn->data_prot,
+ &buf, conn);
bytes = htonl(bytes);
block_write(fd, &bytes, sizeof(bytes));
block_write(fd, buf, ntohl(bytes));
}
int
-sec_fflush(struct connectdata *conn, FILE *F)
+Curl_sec_fflush_fd(struct connectdata *conn, int fd)
{
if(conn->data_prot != prot_clear) {
if(conn->out_buffer.index > 0){
- sec_write(conn, fileno(F),
- conn->out_buffer.data, conn->out_buffer.index);
- conn->out_buffer.index = 0;
- }
- sec_send(conn, fileno(F), NULL, 0);
- }
- fflush(F);
- return 0;
-}
-
-int
-sec_fflush_fd(struct connectdata *conn, int fd)
-{
- if(conn->data_prot != prot_clear) {
- if(conn->out_buffer.index > 0){
- sec_write(conn, fd,
+ Curl_sec_write(conn, fd,
conn->out_buffer.data, conn->out_buffer.index);
conn->out_buffer.index = 0;
}
}
int
-sec_write(struct connectdata *conn, int fd, char *buffer, int length)
+Curl_sec_write(struct connectdata *conn, int fd, char *buffer, int length)
{
int len = conn->buffer_size;
int tx = 0;
if(conn->data_prot == prot_clear)
return write(fd, buffer, length);
- len -= (*mech->overhead)(conn->app_data, conn->data_prot, len);
+ len -= (conn->mech->overhead)(conn->app_data, conn->data_prot, len);
while(length){
if(length < len)
len = length;
}
int
-sec_vfprintf2(struct connectdata *conn, FILE *f, const char *fmt, va_list ap)
+Curl_sec_vfprintf2(struct connectdata *conn, FILE *f, const char *fmt, va_list ap)
{
char *buf;
int ret;
}
int
-sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...)
+Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...)
{
int ret;
va_list ap;
va_start(ap, fmt);
- ret = sec_vfprintf2(conn, f, fmt, ap);
+ ret = Curl_sec_vfprintf2(conn, f, fmt, ap);
va_end(ap);
return ret;
}
int
-sec_putc(struct connectdata *conn, int c, FILE *F)
+Curl_sec_putc(struct connectdata *conn, int c, FILE *F)
{
char ch = c;
if(conn->data_prot == prot_clear)
buffer_write(&conn->out_buffer, &ch, 1);
if(c == '\n' || conn->out_buffer.index >= 1024 /* XXX */) {
- sec_write(conn, fileno(F), conn->out_buffer.data, conn->out_buffer.index);
+ Curl_sec_write(conn, fileno(F), conn->out_buffer.data, conn->out_buffer.index);
conn->out_buffer.index = 0;
}
return c;
}
int
-sec_read_msg(struct connectdata *conn, char *s, int level)
+Curl_sec_read_msg(struct connectdata *conn, char *s, int level)
{
int len;
char *buf;
buf = malloc(strlen(s));
len = Curl_base64_decode(s + 4, buf); /* XXX */
- len = (*mech->decode)(conn->app_data, buf, len, level, conn);
+ len = (conn->mech->decode)(conn->app_data, buf, len, level, conn);
if(len < 0)
return -1;
/* modified to return how many bytes written, or -1 on error ***/
int
-sec_vfprintf(struct connectdata *conn, FILE *f, const char *fmt, va_list ap)
+Curl_sec_vfprintf(struct connectdata *conn, FILE *f, const char *fmt, va_list ap)
{
int ret = 0;
char *buf;
return vfprintf(f, fmt, ap);
buf = aprintf(fmt, ap);
- len = (*mech->encode)(conn->app_data, buf, strlen(buf),
- conn->command_prot, &enc,
- conn);
+ len = (conn->mech->encode)(conn->app_data, buf, strlen(buf),
+ conn->command_prot, &enc,
+ conn);
free(buf);
if(len < 0) {
failf(conn->data, "Failed to encode command.\n");
failf(conn->data, "Out of memory base64-encoding.\n");
return -1;
}
-#ifdef FTP_SERVER
- if(command_prot == prot_safe)
- fprintf(f, "631 %s\r\n", buf);
- else if(command_prot == prot_private)
- fprintf(f, "632 %s\r\n", buf);
- else if(command_prot == prot_confidential)
- fprintf(f, "633 %s\r\n", buf);
-#else
if(conn->command_prot == prot_safe)
ret = fprintf(f, "MIC %s", buf);
else if(conn->command_prot == prot_private)
ret = fprintf(f, "ENC %s", buf);
else if(conn->command_prot == prot_confidential)
ret = fprintf(f, "CONF %s", buf);
-#endif
+
free(buf);
return ret;
}
int
-sec_fprintf(struct connectdata *conn, FILE *f, const char *fmt, ...)
+Curl_sec_fprintf(struct connectdata *conn, FILE *f, const char *fmt, ...)
{
va_list ap;
int ret;
va_start(ap, fmt);
- ret = sec_vfprintf(conn, f, fmt, ap);
+ ret = Curl_sec_vfprintf(conn, f, fmt, ap);
va_end(ap);
return ret;
}
-/* end common stuff */
-
-#ifdef FTP_SERVER
-
-/* snip */
-
-#else /* FTP_SERVER */
-#if 0
-void
-sec_status(void)
+enum protection_level
+Curl_set_command_prot(struct connectdata *conn, enum protection_level level)
{
- if(conn->sec_complete){
- printf("Using %s for authentication.\n", mech->name);
- printf("Using %s command channel.\n", level_to_name(command_prot));
- printf("Using %s data channel.\n", level_to_name(data_prot));
- if(buffer_size > 0)
- printf("Protection buffer size: %lu.\n",
- (unsigned long)buffer_size);
- }else{
- printf("Not using any security mechanism.\n");
- }
+ enum protection_level old = conn->command_prot;
+ conn->command_prot = level;
+ return old;
}
-#endif
static int
sec_prot_internal(struct connectdata *conn, int level)
return 0;
}
-enum protection_level
-set_command_prot(struct connectdata *conn, enum protection_level level)
-{
- enum protection_level old = conn->command_prot;
- conn->command_prot = level;
- return old;
-}
-
-#if 0
void
-sec_prot(int argc, char **argv)
-{
- int level = -1;
-
- if(argc < 2 || argc > 3)
- goto usage;
- if(!sec_complete) {
- printf("No security data exchange has taken place.\n");
- code = -1;
- return;
- }
- level = name_to_level(argv[argc - 1]);
-
- if(level == -1)
- goto usage;
-
- if((*mech->check_prot)(conn->app_data, level)) {
- printf("%s does not implement %s protection.\n",
- mech->name, level_to_name(level));
- code = -1;
- return;
- }
-
- if(argc == 2 || strncasecmp(argv[1], "data", strlen(argv[1])) == 0) {
- if(sec_prot_internal(level) < 0){
- code = -1;
- return;
- }
- } else if(strncasecmp(argv[1], "command", strlen(argv[1])) == 0)
- set_command_prot(level);
- else
- goto usage;
- code = 0;
- return;
- usage:
- printf("usage: %s [command|data] [clear|safe|confidential|private]\n",
- argv[0]);
- code = -1;
-}
-#endif
-
-void
-sec_set_protection_level(struct connectdata *conn)
+Curl_sec_set_protection_level(struct connectdata *conn)
{
if(conn->sec_complete && conn->data_prot != conn->request_data_prot)
sec_prot_internal(conn, conn->request_data_prot);
int
-sec_request_prot(struct connectdata *conn, const char *level)
+Curl_sec_request_prot(struct connectdata *conn, const char *level)
{
int l = name_to_level(level);
if(l == -1)
}
int
-sec_login(struct connectdata *conn)
+Curl_sec_login(struct connectdata *conn)
{
int ret;
- struct sec_client_mech **m;
+ struct Curl_sec_client_mech **m;
ssize_t nread;
struct UrlData *data=conn->data;
/* mechanism is supposed to output error string */
return -1;
}
- mech = *m;
+ conn->mech = *m;
conn->sec_complete = 1;
conn->command_prot = prot_safe;
break;
}
void
-sec_end(struct connectdata *conn)
+Curl_sec_end(struct connectdata *conn)
{
- if (mech != NULL) {
- if(mech->end)
- (*mech->end)(conn->app_data);
- memset(conn->app_data, 0, mech->size);
- free(conn->app_data);
- conn->app_data = NULL;
- }
- conn->sec_complete = 0;
- conn->data_prot = (enum protection_level)0;
+ if (conn->mech != NULL) {
+ if(conn->mech->end)
+ (conn->mech->end)(conn->app_data);
+ memset(conn->app_data, 0, conn->mech->size);
+ free(conn->app_data);
+ conn->app_data = NULL;
+ }
+ conn->sec_complete = 0;
+ conn->data_prot = (enum protection_level)0;
+ conn->mech=NULL;
}
-#endif /* FTP_SERVER */
-
#endif /* KRB4 */
projects / curl / commitdiff