Ignore:
Timestamp:
Mar 30, 2012 7:10:13 AM (12 years ago)
Author:
bennylp
Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjlib/include/pj/ssl_sock.h

    r3553 r3999  
    333333 
    334334/** 
     335 * Check if the specified cipher is supported by SSL/TLS backend. 
     336 * 
     337 * @param cipher        The cipher. 
     338 * 
     339 * @return              PJ_TRUE when supported. 
     340 */ 
     341PJ_DECL(pj_bool_t) pj_ssl_cipher_is_supported(pj_ssl_cipher cipher); 
     342 
     343 
     344/** 
    335345 * Get cipher name string. 
    336346 * 
    337347 * @param cipher        The cipher. 
    338348 * 
    339  * @return              The cipher name or NULL if cipher is not recognized. 
     349 * @return              The cipher name or NULL if cipher is not recognized/ 
     350 *                      supported. 
    340351 */ 
    341352PJ_DECL(const char*) pj_ssl_cipher_name(pj_ssl_cipher cipher); 
     353 
     354 
     355/** 
     356 * Get cipher ID from cipher name string. 
     357 * 
     358 * @param cipher_name   The cipher name string. 
     359 * 
     360 * @return              The cipher ID or PJ_TLS_UNKNOWN_CIPHER if the cipher 
     361 *                      name string is not recognized/supported. 
     362 */ 
     363PJ_DECL(pj_ssl_cipher) pj_ssl_cipher_id(const char *cipher_name); 
    342364 
    343365 
Note: See TracChangeset for help on using the changeset viewer.