I had forgotten that nesec_set_tls() has to be called AFTER the

[nmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 4efd1c54b8a85ae17e73c3415d61d784ebea3d52..c9dd291e986eedfd26a145e574e121e043365857 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -320,7 +320,7 @@ void print_version (char *);
 void push (void);
 char *pwd (void);
 char *r1bindex(char *, int);
 void push (void);
 char *pwd (void);
 char *r1bindex(char *, int);

-void readconfig (struct node **, FILE *, char *, int);
+void readconfig (struct node **, FILE *, const char *, int);

 int refile (char **, char *);
 void ruserpass (char *, char **, char **);
 int remdir (char *);
 int refile (char **, char *);
 void ruserpass (char *, char **, char **);
 int remdir (char *);


@@ -451,12 +451,16 @@ int sc_length(void);
 int sc_width(void);
 int build_form (char *, char *, int *, char *, char *, char *, char *,
                char *, char *);
 int sc_width(void);
 int build_form (char *, char *, int *, char *, char *, char *, char *,
                char *, char *);

-int sendsbr (char **, int, char *, char *, struct stat *, int);
+int sendsbr (char **, int, char *, char *, struct stat *, int, const char *);

 int SOprintf (char *, ...);
 int what_now (char *, int, int, char *, char *,
        int, struct msgs *, char *, int, char *, int);
 int WhatNow(int, char **);
 
 int SOprintf (char *, ...);
 int what_now (char *, int, int, char *, char *,
        int, struct msgs *, char *, int, char *, int);
 int WhatNow(int, char **);
 

+/* Includes trailing NUL */
+
+#define BASE64SIZE(x) ((((x + 2) / 3) * 4) + 1)
+

 /*
  * Copy data from one file to another, converting to base64-encoding.
  *
 /*
  * Copy data from one file to another, converting to base64-encoding.
  *


@@ -470,8 +474,19 @@ int WhatNow(int, char **);
  */
 int writeBase64aux(FILE *in, FILE *out, int crlf);
 
  */
 int writeBase64aux(FILE *in, FILE *out, int crlf);
 

-int writeBase64 (unsigned char *, size_t, unsigned char *);
-int writeBase64raw (unsigned char *, size_t, unsigned char *);
+int writeBase64 (const unsigned char *, size_t, unsigned char *);
+int writeBase64raw (const unsigned char *, size_t, unsigned char *);
+
+/*
+ * first argument:  the string to be decoded
+ * second argument:  the decoded bytes
+ * third argument:  number of decoded bytes
+ * fourth argument:   non-zero for text content, and for which CR's should be skipped
+ * fifth argument:  for an MD5 digest, it can be null
+ */
+int decodeBase64 (const char *, const char **, size_t *, int, unsigned char *);
+
+void hexify (const unsigned char *, size_t, char **);

 
 /*
  * credentials management
 
 /*
  * credentials management