365c5ba395
When doing multi-part formposts, libcurl used a pseudo-random value that was seeded with time(). This turns out to be bad for users who formpost data that is provided with users who then can guess how the boundary string will look like and then they can forge a different formpost part and trick the receiver. My advice to such implementors is (still even after this change) to not rely on the boundary strings being cryptographically strong. Fix your code and logic to not depend on them that much! I moved the Curl_rand() function into the sslgen.c source file now to be able to take advantage of the SSL library's random function if it provides one. If not, try to use the RANDOM_FILE for seeding and as a last resort keep the old logic, just modified to also add microseconds which makes it harder to properly guess the exact seed. The formboundary() function in formdata.c is now using 64 bit entropy for the boundary and therefore the string of dashes was reduced by 4 letters and there are 16 hex digits following it. The total length is thus still the same. Bug: http://curl.haxx.se/bug/view.cgi?id=1251 Reported-by: "Floris"
118 lines
4.7 KiB
C
118 lines
4.7 KiB
C
#ifndef HEADER_CURL_SSLGEN_H
|
|
#define HEADER_CURL_SSLGEN_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#ifndef MD5_DIGEST_LENGTH
|
|
#define MD5_DIGEST_LENGTH 16 /* fixed size */
|
|
#endif
|
|
|
|
bool Curl_ssl_config_matches(struct ssl_config_data* data,
|
|
struct ssl_config_data* needle);
|
|
bool Curl_clone_ssl_config(struct ssl_config_data* source,
|
|
struct ssl_config_data* dest);
|
|
void Curl_free_ssl_config(struct ssl_config_data* sslc);
|
|
|
|
unsigned int Curl_rand(struct SessionHandle *);
|
|
|
|
#ifdef USE_SSL
|
|
int Curl_ssl_init(void);
|
|
void Curl_ssl_cleanup(void);
|
|
CURLcode Curl_ssl_connect(struct connectdata *conn, int sockindex);
|
|
CURLcode Curl_ssl_connect_nonblocking(struct connectdata *conn,
|
|
int sockindex,
|
|
bool *done);
|
|
/* tell the SSL stuff to close down all open information regarding
|
|
connections (and thus session ID caching etc) */
|
|
void Curl_ssl_close_all(struct SessionHandle *data);
|
|
void Curl_ssl_close(struct connectdata *conn, int sockindex);
|
|
CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex);
|
|
CURLcode Curl_ssl_set_engine(struct SessionHandle *data, const char *engine);
|
|
/* Sets engine as default for all SSL operations */
|
|
CURLcode Curl_ssl_set_engine_default(struct SessionHandle *data);
|
|
struct curl_slist *Curl_ssl_engines_list(struct SessionHandle *data);
|
|
|
|
/* init the SSL session ID cache */
|
|
CURLcode Curl_ssl_initsessions(struct SessionHandle *, size_t);
|
|
size_t Curl_ssl_version(char *buffer, size_t size);
|
|
bool Curl_ssl_data_pending(const struct connectdata *conn,
|
|
int connindex);
|
|
int Curl_ssl_check_cxn(struct connectdata *conn);
|
|
void Curl_ssl_free_certinfo(struct SessionHandle *data);
|
|
|
|
/* Functions to be used by SSL library adaptation functions */
|
|
|
|
/* extract a session ID */
|
|
int Curl_ssl_getsessionid(struct connectdata *conn,
|
|
void **ssl_sessionid,
|
|
size_t *idsize) /* set 0 if unknown */;
|
|
/* add a new session ID */
|
|
CURLcode Curl_ssl_addsessionid(struct connectdata *conn,
|
|
void *ssl_sessionid,
|
|
size_t idsize);
|
|
/* Kill a single session ID entry in the cache */
|
|
void Curl_ssl_kill_session(struct curl_ssl_session *session);
|
|
/* delete a session from the cache */
|
|
void Curl_ssl_delsessionid(struct connectdata *conn, void *ssl_sessionid);
|
|
|
|
/* get N random bytes into the buffer */
|
|
void Curl_ssl_random(struct SessionHandle *data, unsigned char *buffer,
|
|
size_t length);
|
|
void Curl_ssl_md5sum(unsigned char *tmp, /* input */
|
|
size_t tmplen,
|
|
unsigned char *md5sum, /* output */
|
|
size_t md5len);
|
|
|
|
#define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */
|
|
|
|
#ifdef have_curlssl_random
|
|
#define HAVE_CURL_SSL_RANDOM
|
|
#endif
|
|
#ifdef have_curlssl_md5sum
|
|
#define HAVE_CURL_SSL_MD5SUM
|
|
#endif
|
|
|
|
#else
|
|
/* When SSL support is not present, just define away these function calls */
|
|
#define Curl_ssl_init() 1
|
|
#define Curl_ssl_cleanup() Curl_nop_stmt
|
|
#define Curl_ssl_connect(x,y) CURLE_NOT_BUILT_IN
|
|
#define Curl_ssl_close_all(x) Curl_nop_stmt
|
|
#define Curl_ssl_close(x,y) Curl_nop_stmt
|
|
#define Curl_ssl_shutdown(x,y) CURLE_NOT_BUILT_IN
|
|
#define Curl_ssl_set_engine(x,y) CURLE_NOT_BUILT_IN
|
|
#define Curl_ssl_set_engine_default(x) CURLE_NOT_BUILT_IN
|
|
#define Curl_ssl_engines_list(x) NULL
|
|
#define Curl_ssl_send(a,b,c,d,e) -1
|
|
#define Curl_ssl_recv(a,b,c,d,e) -1
|
|
#define Curl_ssl_initsessions(x,y) CURLE_OK
|
|
#define Curl_ssl_version(x,y) 0
|
|
#define Curl_ssl_data_pending(x,y) 0
|
|
#define Curl_ssl_check_cxn(x) 0
|
|
#define Curl_ssl_free_certinfo(x) Curl_nop_stmt
|
|
#define Curl_ssl_connect_nonblocking(x,y,z) CURLE_NOT_BUILT_IN
|
|
#define Curl_ssl_kill_session(x) Curl_nop_stmt
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_SSLGEN_H */
|