diff options
Diffstat (limited to 'src/lib/libcrypto/dso/dso.h')
-rw-r--r-- | src/lib/libcrypto/dso/dso.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/dso/dso.h b/src/lib/libcrypto/dso/dso.h index f36f209afd..9010251bbc 100644 --- a/src/lib/libcrypto/dso/dso.h +++ b/src/lib/libcrypto/dso/dso.h | |||
@@ -112,7 +112,7 @@ typedef struct dso_st DSO; | |||
112 | * (or NULL if they are to be used independantly of a DSO object) and a | 112 | * (or NULL if they are to be used independantly of a DSO object) and a |
113 | * filename to transform. They should either return NULL (if there is an error | 113 | * filename to transform. They should either return NULL (if there is an error |
114 | * condition) or a newly allocated string containing the transformed form that | 114 | * condition) or a newly allocated string containing the transformed form that |
115 | * the caller will need to free with OPENSSL_free() when done. */ | 115 | * the caller will need to free with free() when done. */ |
116 | typedef char* (*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *); | 116 | typedef char* (*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *); |
117 | /* The function prototype used for method functions (or caller-provided | 117 | /* The function prototype used for method functions (or caller-provided |
118 | * callbacks) that merge two file specifications. They are passed a | 118 | * callbacks) that merge two file specifications. They are passed a |
@@ -120,7 +120,7 @@ typedef char* (*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *); | |||
120 | * a DSO object) and two file specifications to merge. They should | 120 | * a DSO object) and two file specifications to merge. They should |
121 | * either return NULL (if there is an error condition) or a newly allocated | 121 | * either return NULL (if there is an error condition) or a newly allocated |
122 | * string containing the result of merging that the caller will need | 122 | * string containing the result of merging that the caller will need |
123 | * to free with OPENSSL_free() when done. | 123 | * to free with free() when done. |
124 | * Here, merging means that bits and pieces are taken from each of the | 124 | * Here, merging means that bits and pieces are taken from each of the |
125 | * file specifications and added together in whatever fashion that is | 125 | * file specifications and added together in whatever fashion that is |
126 | * sensible for the DSO method in question. The only rule that really | 126 | * sensible for the DSO method in question. The only rule that really |
@@ -136,7 +136,7 @@ typedef struct dso_meth_st | |||
136 | const char *name; | 136 | const char *name; |
137 | /* Loads a shared library, NB: new DSO_METHODs must ensure that a | 137 | /* Loads a shared library, NB: new DSO_METHODs must ensure that a |
138 | * successful load populates the loaded_filename field, and likewise a | 138 | * successful load populates the loaded_filename field, and likewise a |
139 | * successful unload OPENSSL_frees and NULLs it out. */ | 139 | * successful unload frees and NULLs it out. */ |
140 | int (*dso_load)(DSO *dso); | 140 | int (*dso_load)(DSO *dso); |
141 | /* Unloads a shared library */ | 141 | /* Unloads a shared library */ |
142 | int (*dso_unload)(DSO *dso); | 142 | int (*dso_unload)(DSO *dso); |
@@ -242,12 +242,12 @@ int DSO_set_filename(DSO *dso, const char *filename); | |||
242 | * simply duplicated. NB: This function is usually called from within a | 242 | * simply duplicated. NB: This function is usually called from within a |
243 | * DSO_METHOD during the processing of a DSO_load() call, and is exposed so that | 243 | * DSO_METHOD during the processing of a DSO_load() call, and is exposed so that |
244 | * caller-created DSO_METHODs can do the same thing. A non-NULL return value | 244 | * caller-created DSO_METHODs can do the same thing. A non-NULL return value |
245 | * will need to be OPENSSL_free()'d. */ | 245 | * will need to be free()'d. */ |
246 | char *DSO_convert_filename(DSO *dso, const char *filename); | 246 | char *DSO_convert_filename(DSO *dso, const char *filename); |
247 | /* This function will invoke the DSO's merger callback to merge two file | 247 | /* This function will invoke the DSO's merger callback to merge two file |
248 | * specifications, or if the callback isn't set it will instead use the | 248 | * specifications, or if the callback isn't set it will instead use the |
249 | * DSO_METHOD's merger. A non-NULL return value will need to be | 249 | * DSO_METHOD's merger. A non-NULL return value will need to be |
250 | * OPENSSL_free()'d. */ | 250 | * free()'d. */ |
251 | char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2); | 251 | char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2); |
252 | /* If the DSO is currently loaded, this returns the filename that it was loaded | 252 | /* If the DSO is currently loaded, this returns the filename that it was loaded |
253 | * under, otherwise it returns NULL. So it is also useful as a test as to | 253 | * under, otherwise it returns NULL. So it is also useful as a test as to |