patch-src_polarssl_include_polarssl_config_h 19 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706
  1. --- mongrel2-v1.9.1.orig/src/polarssl/include/polarssl/config.h 2014-04-09 19:39:37.000000000 +0200
  2. +++ mongrel2-v1.9.1/src/polarssl/include/polarssl/config.h 2015-05-04 23:10:25.000000000 +0200
  3. @@ -71,7 +71,9 @@
  4. /**
  5. * \def POLARSSL_HAVE_ASM
  6. *
  7. - * The compiler has support for asm().
  8. + * The compiler has support for asm()
  9. + *
  10. + * Uncomment to enable the use of assembly code.
  11. *
  12. * Requires support for asm() in compiler.
  13. *
  14. @@ -80,7 +82,6 @@
  15. * library/padlock.c
  16. * include/polarssl/bn_mul.h
  17. *
  18. - * Comment to disable the use of assembly code.
  19. */
  20. #define POLARSSL_HAVE_ASM
  21. @@ -90,18 +91,19 @@
  22. * CPU supports SSE2 instruction set.
  23. *
  24. * Uncomment if the CPU supports SSE2 (IA-32 specific).
  25. + *
  26. #define POLARSSL_HAVE_SSE2
  27. */
  28. /**
  29. * \def POLARSSL_HAVE_TIME
  30. *
  31. - * System has time.h and time() / localtime() / gettimeofday().
  32. + * System has time.h and time() / localtime() / gettimeofday()
  33. *
  34. * Comment if your system does not support time functions
  35. */
  36. #define POLARSSL_HAVE_TIME
  37. -/* \} name SECTION: System support */
  38. +/* \} name */
  39. /**
  40. * \name SECTION: PolarSSL feature support
  41. @@ -216,7 +218,7 @@
  42. /**
  43. * \def POLARSSL_ENABLE_WEAK_CIPHERSUITES
  44. *
  45. - * Enable weak ciphersuites in SSL / TLS.
  46. + * Enable weak ciphersuites in SSL / TLS
  47. * Warning: Only do so when you know what you are doing. This allows for
  48. * channels with virtually no security at all!
  49. *
  50. @@ -245,7 +247,7 @@
  51. /**
  52. * \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
  53. *
  54. - * Enable the PSK based ciphersuite modes in SSL / TLS.
  55. + * Enable the PSK based ciphersuite modes in SSL / TLS
  56. *
  57. * This enables the following ciphersuites (if other requisites are
  58. * enabled as well):
  59. @@ -263,7 +265,7 @@
  60. /**
  61. * \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
  62. *
  63. - * Enable the DHE-PSK based ciphersuite modes in SSL / TLS.
  64. + * Enable the DHE-PSK based ciphersuite modes in SSL / TLS
  65. *
  66. * Requires: POLARSSL_DHM_C
  67. *
  68. @@ -283,10 +285,9 @@
  69. /**
  70. * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
  71. *
  72. - * Enable the RSA-PSK based ciphersuite modes in SSL / TLS.
  73. + * Enable the RSA-PSK based ciphersuite modes in SSL / TLS
  74. * (NOT YET IMPLEMENTED)
  75. - * Requires: POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
  76. - * POLARSSL_X509_CRT_PARSE_C
  77. + * Requires: POLARSSL_RSA_C, POLARSSL_X509_CRT_PARSE_C, POLARSSL_PKCS1_V15
  78. *
  79. * This enables the following ciphersuites (if other requisites are
  80. * enabled as well):
  81. @@ -304,10 +305,9 @@
  82. /**
  83. * \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
  84. *
  85. - * Enable the RSA-only based ciphersuite modes in SSL / TLS.
  86. + * Enable the RSA-only based ciphersuite modes in SSL / TLS
  87. *
  88. - * Requires: POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
  89. - * POLARSSL_X509_CRT_PARSE_C
  90. + * Requires: POLARSSL_RSA_C, POLARSSL_X509_CRT_PARSE_C, POLARSSL_PKCS1_V15
  91. *
  92. * This enables the following ciphersuites (if other requisites are
  93. * enabled as well):
  94. @@ -330,10 +330,10 @@
  95. /**
  96. * \def POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED
  97. *
  98. - * Enable the DHE-RSA based ciphersuite modes in SSL / TLS.
  99. + * Enable the DHE-RSA based ciphersuite modes in SSL / TLS
  100. *
  101. - * Requires: POLARSSL_DHM_C, POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
  102. - * POLARSSL_X509_CRT_PARSE_C
  103. + * Requires: POLARSSL_DHM_C, POLARSSL_RSA_C, POLARSSL_X509_CRT_PARSE_C,
  104. + * POLARSSL_PKCS1_V15
  105. *
  106. * This enables the following ciphersuites (if other requisites are
  107. * enabled as well):
  108. @@ -352,10 +352,10 @@
  109. /**
  110. * \def POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
  111. *
  112. - * Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
  113. + * Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS
  114. *
  115. - * Requires: POLARSSL_ECDH_C, POLARSSL_RSA_C, POLARSSL_PKCS1_V15,
  116. - * POLARSSL_X509_CRT_PARSE_C
  117. + * Requires: POLARSSL_ECDH_C, POLARSSL_RSA_C, POLARSSL_X509_CRT_PARSE_C,
  118. + * POLARSSL_PKCS1_V15
  119. *
  120. * This enables the following ciphersuites (if other requisites are
  121. * enabled as well):
  122. @@ -375,9 +375,9 @@
  123. /**
  124. * \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
  125. *
  126. - * Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
  127. + * Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS
  128. *
  129. - * Requires: POLARSSL_ECDH_C, POLARSSL_ECDSA_C, POLARSSL_X509_CRT_PARSE_C,
  130. + * Requires: POLARSSL_ECDH_C, POLARSSL_ECDSA_C, POLARSSL_X509_CRT_PARSE_C
  131. *
  132. * This enables the following ciphersuites (if other requisites are
  133. * enabled as well):
  134. @@ -419,9 +419,9 @@
  135. /**
  136. * \def POLARSSL_GENPRIME
  137. *
  138. - * Enable the prime-number generation code.
  139. + * Requires: POLARSSL_BIGNUM_C, POLARSSL_RSA_C
  140. *
  141. - * Requires: POLARSSL_BIGNUM_C
  142. + * Enable the RSA prime-number generation code.
  143. */
  144. #define POLARSSL_GENPRIME
  145. @@ -485,10 +485,9 @@
  146. /**
  147. * \def POLARSSL_PKCS1_V15
  148. *
  149. - * Enable support for PKCS#1 v1.5 encoding.
  150. - *
  151. * Requires: POLARSSL_RSA_C
  152. *
  153. + * Enable support for PKCS#1 v1.5 encoding.
  154. * This enables support for PKCS#1 v1.5 operations.
  155. */
  156. #define POLARSSL_PKCS1_V15
  157. @@ -496,10 +495,9 @@
  158. /**
  159. * \def POLARSSL_PKCS1_V21
  160. *
  161. - * Enable support for PKCS#1 v2.1 encoding.
  162. - *
  163. * Requires: POLARSSL_MD_C, POLARSSL_RSA_C
  164. *
  165. + * Enable support for PKCS#1 v2.1 encoding.
  166. * This enables support for RSAES-OAEP and RSASSA-PSS operations.
  167. */
  168. #define POLARSSL_PKCS1_V21
  169. @@ -565,7 +563,7 @@
  170. * \def POLARSSL_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
  171. *
  172. * Enable support for receiving and parsing SSLv2 Client Hello messages for the
  173. - * SSL Server module (POLARSSL_SSL_SRV_C).
  174. + * SSL Server module (POLARSSL_SSL_SRV_C)
  175. *
  176. * Comment this macro to disable support for SSLv2 Client Hello messages.
  177. */
  178. @@ -574,7 +572,7 @@
  179. /**
  180. * \def POLARSSL_SSL_MAX_FRAGMENT_LENGTH
  181. *
  182. - * Enable support for RFC 6066 max_fragment_length extension in SSL.
  183. + * Enable support for RFC 6066 max_fragment_length extension in SSL
  184. *
  185. * Comment this macro to disable support for the max_fragment_length extension
  186. */
  187. @@ -583,7 +581,7 @@
  188. /**
  189. * \def POLARSSL_SSL_PROTO_SSL3
  190. *
  191. - * Enable support for SSL 3.0.
  192. + * Enable support for SSL 3.0
  193. *
  194. * Requires: POLARSSL_MD5_C
  195. * POLARSSL_SHA1_C
  196. @@ -595,7 +593,7 @@
  197. /**
  198. * \def POLARSSL_SSL_PROTO_TLS1
  199. *
  200. - * Enable support for TLS 1.0.
  201. + * Enable support for TLS 1.0
  202. *
  203. * Requires: POLARSSL_MD5_C
  204. * POLARSSL_SHA1_C
  205. @@ -607,7 +605,7 @@
  206. /**
  207. * \def POLARSSL_SSL_PROTO_TLS1_1
  208. *
  209. - * Enable support for TLS 1.1.
  210. + * Enable support for TLS 1.1
  211. *
  212. * Requires: POLARSSL_MD5_C
  213. * POLARSSL_SHA1_C
  214. @@ -619,7 +617,7 @@
  215. /**
  216. * \def POLARSSL_SSL_PROTO_TLS1_2
  217. *
  218. - * Enable support for TLS 1.2.
  219. + * Enable support for TLS 1.2
  220. *
  221. * Requires: POLARSSL_SHA256_C or POLARSSL_SHA512_C
  222. * (Depends on ciphersuites)
  223. @@ -631,7 +629,7 @@
  224. /**
  225. * \def POLARSSL_SSL_SESSION_TICKETS
  226. *
  227. - * Enable support for RFC 5077 session tickets in SSL.
  228. + * Enable support for RFC 5077 session tickets in SSL
  229. *
  230. * Requires: POLARSSL_AES_C
  231. * POLARSSL_SHA256_C
  232. @@ -644,7 +642,7 @@
  233. /**
  234. * \def POLARSSL_SSL_SERVER_NAME_INDICATION
  235. *
  236. - * Enable support for RFC 6066 server name indication (SNI) in SSL.
  237. + * Enable support for RFC 6066 server name indication (SNI) in SSL
  238. *
  239. * Comment this macro to disable support for server name indication in SSL
  240. */
  241. @@ -653,59 +651,13 @@
  242. /**
  243. * \def POLARSSL_SSL_TRUNCATED_HMAC
  244. *
  245. - * Enable support for RFC 6066 truncated HMAC in SSL.
  246. + * Enable support for RFC 6066 truncated HMAC in SSL
  247. *
  248. * Comment this macro to disable support for truncated HMAC in SSL
  249. */
  250. #define POLARSSL_SSL_TRUNCATED_HMAC
  251. /**
  252. - * \def POLARSSL_THREADING_ALT
  253. - *
  254. - * Provide your own alternate threading implementation.
  255. - *
  256. - * Requires: POLARSSL_THREADING_C
  257. - *
  258. - * Uncomment this to allow your own alternate threading implementation.
  259. -#define POLARSSL_THREADING_ALT
  260. - */
  261. -
  262. -/**
  263. - * \def POLARSSL_THREADING_DUMMY
  264. - *
  265. - * Provide a dummy threading implementation.
  266. - * Warning: If you use this, all claims of thread-safety in the documentation
  267. - * are void!
  268. - *
  269. - * Requires: POLARSSL_THREADING_C
  270. - *
  271. - * Uncomment this to enable code to compile like with threading enabled
  272. -#define POLARSSL_THREADING_DUMMY
  273. - */
  274. -
  275. -/**
  276. - * \def POLARSSL_THREADING_PTHREAD
  277. - *
  278. - * Enable the pthread wrapper layer for the threading layer.
  279. - *
  280. - * Requires: POLARSSL_THREADING_C
  281. - *
  282. - * Uncomment this to enable pthread mutexes.
  283. -#define POLARSSL_THREADING_PTHREAD
  284. - */
  285. -
  286. -/**
  287. - * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
  288. - *
  289. - * If set, the X509 parser will not break-off when parsing an X509 certificate
  290. - * and encountering an extension in a v1 or v2 certificate.
  291. - *
  292. - * Uncomment to prevent an error.
  293. - *
  294. -#define POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
  295. - */
  296. -
  297. -/**
  298. * \def POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
  299. *
  300. * If set, the X509 parser will not break-off when parsing an X509 certificate
  301. @@ -731,7 +683,7 @@
  302. * Uncomment to enable use of ZLIB
  303. #define POLARSSL_ZLIB_SUPPORT
  304. */
  305. -/* \} name SECTION: PolarSSL feature support */
  306. +/* \} name */
  307. /**
  308. * \name SECTION: PolarSSL modules
  309. @@ -794,11 +746,7 @@
  310. * Enable the generic ASN1 parser.
  311. *
  312. * Module: library/asn1.c
  313. - * Caller: library/x509.c
  314. - * library/dhm.c
  315. - * library/pkcs12.c
  316. - * library/pkcs5.c
  317. - * library/pkparse.c
  318. + * Caller: library/x509parse.c
  319. */
  320. #define POLARSSL_ASN1_PARSE_C
  321. @@ -808,11 +756,6 @@
  322. * Enable the generic ASN1 writer.
  323. *
  324. * Module: library/asn1write.c
  325. - * Caller: library/ecdsa.c
  326. - * library/pkwrite.c
  327. - * library/x509_create.c
  328. - * library/x509write_crt.c
  329. - * library/x509write_csr.c
  330. */
  331. #define POLARSSL_ASN1_WRITE_C
  332. @@ -835,9 +778,9 @@
  333. *
  334. * Module: library/bignum.c
  335. * Caller: library/dhm.c
  336. - * library/ecp.c
  337. * library/rsa.c
  338. * library/ssl_tls.c
  339. + * library/x509parse.c
  340. *
  341. * This module is required for RSA and DHM support.
  342. */
  343. @@ -900,7 +843,7 @@
  344. /**
  345. * \def POLARSSL_CTR_DRBG_C
  346. *
  347. - * Enable the CTR_DRBG AES-256-based random generator.
  348. + * Enable the CTR_DRBG AES-256-based random generator
  349. *
  350. * Module: library/ctr_drbg.c
  351. * Caller:
  352. @@ -1046,7 +989,7 @@
  353. /**
  354. * \def POLARSSL_GCM_C
  355. *
  356. - * Enable the Galois/Counter Mode (GCM) for AES.
  357. + * Enable the Galois/Counter Mode (GCM) for AES
  358. *
  359. * Module: library/gcm.c
  360. *
  361. @@ -1079,8 +1022,8 @@
  362. * Requires: POLARSSL_TIMING_C
  363. *
  364. * Uncomment to enable the HAVEGE random generator.
  365. -#define POLARSSL_HAVEGE_C
  366. */
  367. +#define POLARSSL_HAVEGE_C
  368. /**
  369. * \def POLARSSL_MD_C
  370. @@ -1097,10 +1040,10 @@
  371. /**
  372. * \def POLARSSL_MD2_C
  373. *
  374. - * Enable the MD2 hash algorithm.
  375. + * Enable the MD2 hash algorithm
  376. *
  377. * Module: library/md2.c
  378. - * Caller:
  379. + * Caller: library/x509parse.c
  380. *
  381. * Uncomment to enable support for (rare) MD2-signed X.509 certs.
  382. *
  383. @@ -1110,10 +1053,10 @@
  384. /**
  385. * \def POLARSSL_MD4_C
  386. *
  387. - * Enable the MD4 hash algorithm.
  388. + * Enable the MD4 hash algorithm
  389. *
  390. * Module: library/md4.c
  391. - * Caller:
  392. + * Caller: library/x509parse.c
  393. *
  394. * Uncomment to enable support for (rare) MD4-signed X.509 certs.
  395. *
  396. @@ -1123,12 +1066,12 @@
  397. /**
  398. * \def POLARSSL_MD5_C
  399. *
  400. - * Enable the MD5 hash algorithm.
  401. + * Enable the MD5 hash algorithm
  402. *
  403. * Module: library/md5.c
  404. - * Caller: library/md.c
  405. - * library/pem.c
  406. + * Caller: library/pem.c
  407. * library/ssl_tls.c
  408. + * library/x509parse.c
  409. *
  410. * This module is required for SSL/TLS and X.509.
  411. * PEM_PARSE uses MD5 for decrypting encrypted keys.
  412. @@ -1150,11 +1093,8 @@
  413. */
  414. /**
  415. - * \def POLARSSL_MEMORY_BUFFER_ALLOC_C
  416. - *
  417. - * Enable the buffer allocator implementation that makes use of a (stack)
  418. - * based buffer to 'allocate' dynamic memory. (replaces malloc() and free()
  419. - * calls)
  420. + * The buffer allocator implementation that makes use of a (stack) based
  421. + * buffer to 'allocate' dynamic memory. (replaces malloc() and free() calls)
  422. *
  423. * Module: library/memory_buffer_alloc.c
  424. *
  425. @@ -1178,21 +1118,12 @@
  426. /**
  427. * \def POLARSSL_OID_C
  428. *
  429. - * Enable the OID database.
  430. + * Enable the OID database
  431. *
  432. * Module: library/oid.c
  433. - * Caller: library/asn1write.c
  434. - * library/pkcs5.c
  435. - * library/pkparse.c
  436. - * library/pkwrite.c
  437. - * library/rsa.c
  438. - * library/x509.c
  439. - * library/x509_create.c
  440. - * library/x509_crl.c
  441. - * library/x509_crt.c
  442. - * library/x509_csr.c
  443. - * library/x509write_crt.c
  444. - * library/x509write_csr.c
  445. + * Caller: library/rsa.c
  446. + * library/x509parse.c
  447. + * library/x509write.c
  448. *
  449. * This modules translates between OIDs and internal values.
  450. */
  451. @@ -1213,7 +1144,7 @@
  452. /**
  453. * \def POLARSSL_PBKDF2_C
  454. *
  455. - * Enable PKCS#5 PBKDF2 key derivation function.
  456. + * Enable PKCS#5 PBKDF2 key derivation function
  457. * DEPRECATED: Use POLARSSL_PKCS5_C instead
  458. *
  459. * Module: library/pbkdf2.c
  460. @@ -1227,14 +1158,11 @@
  461. /**
  462. * \def POLARSSL_PEM_PARSE_C
  463. *
  464. - * Enable PEM decoding / parsing.
  465. + * Enable PEM decoding / parsing
  466. *
  467. * Module: library/pem.c
  468. - * Caller: library/dhm.c
  469. + * Caller: library/x509parse.c
  470. * library/pkparse.c
  471. - * library/x509_crl.c
  472. - * library/x509_crt.c
  473. - * library/x509_csr.c
  474. *
  475. * Requires: POLARSSL_BASE64_C
  476. *
  477. @@ -1245,12 +1173,11 @@
  478. /**
  479. * \def POLARSSL_PEM_WRITE_C
  480. *
  481. - * Enable PEM encoding / writing.
  482. + * Enable PEM encoding / writing
  483. *
  484. * Module: library/pem.c
  485. - * Caller: library/pkwrite.c
  486. - * library/x509write_crt.c
  487. - * library/x509write_csr.c
  488. + * Caller: library/x509write.c
  489. + * library/pkwrite.c
  490. *
  491. * Requires: POLARSSL_BASE64_C
  492. *
  493. @@ -1264,12 +1191,11 @@
  494. * Enable the generic public (asymetric) key layer.
  495. *
  496. * Module: library/pk.c
  497. - * Caller: library/ssl_tls.c
  498. + * Caller: library/x509parse.c
  499. + * library/ssl_tls.c
  500. * library/ssl_cli.c
  501. * library/ssl_srv.c
  502. *
  503. - * Requires: POLARSSL_RSA_C or POLARSSL_ECP_C
  504. - *
  505. * Uncomment to enable generic public key wrappers.
  506. */
  507. #define POLARSSL_PK_C
  508. @@ -1280,8 +1206,7 @@
  509. * Enable the generic public (asymetric) key parser.
  510. *
  511. * Module: library/pkparse.c
  512. - * Caller: library/x509_crt.c
  513. - * library/x509_csr.c
  514. + * Caller: library/x509parse.c
  515. *
  516. * Requires: POLARSSL_PK_C
  517. *
  518. @@ -1306,7 +1231,7 @@
  519. /**
  520. * \def POLARSSL_PKCS5_C
  521. *
  522. - * Enable PKCS#5 functions.
  523. + * Enable PKCS#5 functions
  524. *
  525. * Module: library/pkcs5.c
  526. *
  527. @@ -1334,11 +1259,11 @@
  528. /**
  529. * \def POLARSSL_PKCS12_C
  530. *
  531. - * Enable PKCS#12 PBE functions.
  532. + * Enable PKCS#12 PBE functions
  533. * Adds algorithms for parsing PKCS#8 encrypted private keys
  534. *
  535. * Module: library/pkcs12.c
  536. - * Caller: library/pkparse.c
  537. + * Caller: library/x509parse.c
  538. *
  539. * Requires: POLARSSL_ASN1_PARSE_C, POLARSSL_CIPHER_C, POLARSSL_MD_C
  540. * Can use: POLARSSL_ARC4_C
  541. @@ -1370,11 +1295,10 @@
  542. * Enable the SHA1 cryptographic hash algorithm.
  543. *
  544. * Module: library/sha1.c
  545. - * Caller: library/md.c
  546. - * library/ssl_cli.c
  547. + * Caller: library/ssl_cli.c
  548. * library/ssl_srv.c
  549. * library/ssl_tls.c
  550. - * library/x509write_crt.c
  551. + * library/x509parse.c
  552. *
  553. * This module is required for SSL/TLS and SHA1-signed certificates.
  554. */
  555. @@ -1387,11 +1311,8 @@
  556. * (Used to be POLARSSL_SHA2_C)
  557. *
  558. * Module: library/sha256.c
  559. - * Caller: library/entropy.c
  560. - * library/md.c
  561. - * library/ssl_cli.c
  562. - * library/ssl_srv.c
  563. - * library/ssl_tls.c
  564. + * Caller: library/md_wrap.c
  565. + * library/x509parse.c
  566. *
  567. * This module adds support for SHA-224 and SHA-256.
  568. * This module is required for the SSL/TLS 1.2 PRF function.
  569. @@ -1405,10 +1326,8 @@
  570. * (Used to be POLARSSL_SHA4_C)
  571. *
  572. * Module: library/sha512.c
  573. - * Caller: library/entropy.c
  574. - * library/md.c
  575. - * library/ssl_cli.c
  576. - * library/ssl_srv.c
  577. + * Caller: library/md_wrap.c
  578. + * library/x509parse.c
  579. *
  580. * This module adds support for SHA-384 and SHA-512.
  581. */
  582. @@ -1463,7 +1382,7 @@
  583. * Caller: library/ssl_cli.c
  584. * library/ssl_srv.c
  585. *
  586. - * Requires: POLARSSL_CIPHER_C, POLARSSL_MD_C
  587. + * Requires: POLARSSL_CIPHER_C, POLARSSL_PK_C, POLARSSL_MD_C
  588. * and at least one of the POLARSSL_SSL_PROTO_* defines
  589. *
  590. * This module is required for SSL/TLS.
  591. @@ -1471,27 +1390,6 @@
  592. #define POLARSSL_SSL_TLS_C
  593. /**
  594. - * \def POLARSSL_THREADING_C
  595. - *
  596. - * Enable the threading abstraction layer.
  597. - * By default PolarSSL assumes it is used in a non-threaded environment or that
  598. - * contexts are not shared between threads. If you do intend to use contexts
  599. - * between threads, you will need to enable this layer to prevent race
  600. - * conditions.
  601. - *
  602. - * Module: library/threading.c
  603. - *
  604. - * This allows different threading implementations (self-implemented or
  605. - * provided).
  606. - *
  607. - * You will have to enable either POLARSSL_THREADING_ALT,
  608. - * POLARSSL_THREADING_PTHREAD or POLARSSL_THREADING_DUMMY.
  609. - *
  610. - * Enable this layer to allow use of mutexes within PolarSSL
  611. -#define POLARSSL_THREADING_C
  612. - */
  613. -
  614. -/**
  615. * \def POLARSSL_TIMING_C
  616. *
  617. * Enable the portable timing interface.
  618. @@ -1517,7 +1415,7 @@
  619. /**
  620. * \def POLARSSL_X509_USE_C
  621. *
  622. - * Enable X.509 core for using certificates.
  623. + * Enable X.509 core for using certificates
  624. *
  625. * Module: library/x509.c
  626. * Caller: library/x509_crl.c
  627. @@ -1578,7 +1476,7 @@
  628. /**
  629. * \def POLARSSL_X509_CREATE_C
  630. *
  631. - * Enable X.509 core for creating certificates.
  632. + * Enable X.509 core for creating certificates
  633. *
  634. * Module: library/x509_create.c
  635. *
  636. @@ -1604,7 +1502,7 @@
  637. /**
  638. * \def POLARSSL_X509_CSR_WRITE_C
  639. *
  640. - * Enable creating X.509 Certificate Signing Requests (CSR).
  641. + * Enable creating X.509 Certificate Signing Requests (CSR)
  642. *
  643. * Module: library/x509_csr_write.c
  644. *
  645. @@ -1624,7 +1522,7 @@
  646. */
  647. #define POLARSSL_XTEA_C
  648. -/* \} name SECTION: PolarSSL modules */
  649. +/* \} name */
  650. /**
  651. * \name SECTION: Module configuration options
  652. @@ -1804,7 +1702,7 @@
  653. #endif
  654. #if defined(POLARSSL_SSL_TLS_C) && ( !defined(POLARSSL_CIPHER_C) || \
  655. - !defined(POLARSSL_MD_C) )
  656. + !defined(POLARSSL_PK_C) || !defined(POLARSSL_MD_C) )
  657. #error "POLARSSL_SSL_TLS_C defined, but not all prerequisites"
  658. #endif
  659. @@ -1840,32 +1738,6 @@
  660. #error "POLARSSL_SSL_SESSION_TICKETS_C defined, but not all prerequisites"
  661. #endif
  662. -#if defined(POLARSSL_THREADING_DUMMY)
  663. -#if !defined(POLARSSL_THREADING_C) || defined(POLARSSL_THREADING_IMPL)
  664. -#error "POLARSSL_THREADING_DUMMY defined, but not all prerequisites"
  665. -#endif
  666. -#define POLARSSL_THREADING_IMPL
  667. -#endif
  668. -
  669. -#if defined(POLARSSL_THREADING_PTHREAD)
  670. -#if !defined(POLARSSL_THREADING_C) || defined(POLARSSL_THREADING_IMPL)
  671. -#error "POLARSSL_THREADING_PTHREAD defined, but not all prerequisites"
  672. -#endif
  673. -#define POLARSSL_THREADING_IMPL
  674. -#endif
  675. -
  676. -#if defined(POLARSSL_THREADING_ALT)
  677. -#if !defined(POLARSSL_THREADING_C) || defined(POLARSSL_THREADING_IMPL)
  678. -#error "POLARSSL_THREADING_ALT defined, but not all prerequisites"
  679. -#endif
  680. -#define POLARSSL_THREADING_IMPL
  681. -#endif
  682. -
  683. -#if defined(POLARSSL_THREADING_C) && !defined(POLARSSL_THREADING_IMPL)
  684. -#error "POLARSSL_THREADING_C defined, single threading implementation required"
  685. -#endif
  686. -#undef POLARSSL_THREADING_IMPL
  687. -
  688. #if defined(POLARSSL_X509_USE_C) && ( !defined(POLARSSL_BIGNUM_C) || \
  689. !defined(POLARSSL_OID_C) || !defined(POLARSSL_ASN1_PARSE_C) || \
  690. !defined(POLARSSL_PK_PARSE_C) )