projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update filenames in makefiles.
[openssl.git]
/
crypto
/
buffer
/
buffer.h
diff --git
a/crypto/buffer/buffer.h
b/crypto/buffer/buffer.h
index 417548c04a474789f71220be133b448962343146..1db9607450373c7df8ac6bc4c0ef20f8d16f06b4 100644
(file)
--- a/
crypto/buffer/buffer.h
+++ b/
crypto/buffer/buffer.h
@@
-59,49
+59,60
@@
#ifndef HEADER_BUFFER_H
#define HEADER_BUFFER_H
#ifndef HEADER_BUFFER_H
#define HEADER_BUFFER_H
+#include <openssl/ossl_typ.h>
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct buf_mem_st
+#include <stddef.h>
+
+#if !defined(NO_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+/* Already declared in ossl_typ.h */
+/* typedef struct buf_mem_st BUF_MEM; */
+
+struct buf_mem_st
{
int length; /* current number of bytes */
char *data;
int max; /* size of buffer */
{
int length; /* current number of bytes */
char *data;
int max; /* size of buffer */
- }
BUF_MEM
;
+ };
-#ifndef NOPROTO
BUF_MEM *BUF_MEM_new(void);
void BUF_MEM_free(BUF_MEM *a);
int BUF_MEM_grow(BUF_MEM *str, int len);
BUF_MEM *BUF_MEM_new(void);
void BUF_MEM_free(BUF_MEM *a);
int BUF_MEM_grow(BUF_MEM *str, int len);
-char * BUF_strdup(char *str);
-
-void ERR_load_BUF_strings(void );
-
-#else
+int BUF_MEM_grow_clean(BUF_MEM *str, int len);
+char * BUF_strdup(const char *str);
+char * BUF_strndup(const char *str, size_t siz);
+void * BUF_memdup(const void *data, size_t siz);
-BUF_MEM *BUF_MEM_new();
-void BUF_MEM_free();
-int BUF_MEM_grow();
-char * BUF_strdup();
+/* safe string functions */
+size_t BUF_strlcpy(char *dst,const char *src,size_t siz);
+size_t BUF_strlcat(char *dst,const char *src,size_t siz);
-void ERR_load_BUF_strings();
-
-#endif
/* BEGIN ERROR CODES */
/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_BUF_strings(void);
+
/* Error codes for the BUF functions. */
/* Function codes. */
/* Error codes for the BUF functions. */
/* Function codes. */
+#define BUF_F_BUF_MEMDUP 103
#define BUF_F_BUF_MEM_GROW 100
#define BUF_F_BUF_MEM_GROW 100
+#define BUF_F_BUF_MEM_GROW_CLEAN 105
#define BUF_F_BUF_MEM_NEW 101
#define BUF_F_BUF_STRDUP 102
#define BUF_F_BUF_MEM_NEW 101
#define BUF_F_BUF_STRDUP 102
-#define BUF_F_
PXYCLNT_READ 103
+#define BUF_F_
BUF_STRNDUP 104
/* Reason codes. */
/* Reason codes. */
-
+
#ifdef __cplusplus
}
#endif
#endif
#ifdef __cplusplus
}
#endif
#endif
-