Ignore:
Timestamp:
Feb 25, 2010 11:58:19 AM (12 years ago)
Author:
nanang
Message:

More ticket #1032:

  • Updated transport state notification callback to return void.
  • Updated transport state enum to only contain connected and disconnected, no more bitmask value.
  • Added direction field to SIP transport.
  • Removed remote hostname hash from transport key.
  • Updated cert info dump to return -1 when buffer is insufficient.
  • Added new error code PJSIP_TLS_ECERTVERIF.
  • Updated get_cert_name() in ssl_sock_symbian.c to use heap buffer instead of stack.
  • Minors, e.g: added prefix PJ in cipher types, docs.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

    r3106 r3110  
    108108        /* Dump remote TLS certificate verification result */ 
    109109        verif_msg_cnt = PJ_ARRAY_SIZE(verif_msgs); 
    110         pj_ssl_cert_verify_error_st(si->verify_status, 
    111                                     verif_msgs, &verif_msg_cnt); 
     110        pj_ssl_cert_get_verify_status_strings(si->verify_status, 
     111                                              verif_msgs, &verif_msg_cnt); 
    112112        PJ_LOG(3,("", ".....Remote certificate verification result: %s", 
    113113                  (verif_msg_cnt == 1? verif_msgs[0]:""))); 
     
    11541154#ifndef PJ_SYMBIAN 
    11551155 
    1156     PJ_LOG(3,("", "..echo test w/ TLSv1 and TLS_RSA_WITH_DES_CBC_SHA cipher")); 
     1156    PJ_LOG(3,("", "..echo test w/ TLSv1 and PJ_TLS_RSA_WITH_DES_CBC_SHA cipher")); 
    11571157    ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1, PJ_SSL_SOCK_PROTO_TLS1,  
    1158                     TLS_RSA_WITH_DES_CBC_SHA, TLS_RSA_WITH_DES_CBC_SHA,  
     1158                    PJ_TLS_RSA_WITH_DES_CBC_SHA, PJ_TLS_RSA_WITH_DES_CBC_SHA,  
    11591159                    PJ_FALSE, PJ_FALSE); 
    11601160    if (ret != 0) 
    11611161        return ret; 
    11621162 
    1163     PJ_LOG(3,("", "..echo test w/ SSLv23 and TLS_RSA_WITH_AES_256_CBC_SHA cipher")); 
     1163    PJ_LOG(3,("", "..echo test w/ SSLv23 and PJ_TLS_RSA_WITH_AES_256_CBC_SHA cipher")); 
    11641164    ret = echo_test(PJ_SSL_SOCK_PROTO_SSL23, PJ_SSL_SOCK_PROTO_SSL23,  
    1165                     TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA, 
     1165                    PJ_TLS_RSA_WITH_AES_256_CBC_SHA, PJ_TLS_RSA_WITH_AES_256_CBC_SHA, 
    11661166                    PJ_FALSE, PJ_FALSE); 
    11671167    if (ret != 0) 
     
    11701170    PJ_LOG(3,("", "..echo test w/ incompatible proto")); 
    11711171    ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1, PJ_SSL_SOCK_PROTO_SSL3,  
    1172                     TLS_RSA_WITH_DES_CBC_SHA, TLS_RSA_WITH_DES_CBC_SHA, 
     1172                    PJ_TLS_RSA_WITH_DES_CBC_SHA, PJ_TLS_RSA_WITH_DES_CBC_SHA, 
    11731173                    PJ_FALSE, PJ_FALSE); 
    11741174    if (ret == 0) 
     
    11771177    PJ_LOG(3,("", "..echo test w/ incompatible ciphers")); 
    11781178    ret = echo_test(PJ_SSL_SOCK_PROTO_DEFAULT, PJ_SSL_SOCK_PROTO_DEFAULT,  
    1179                     TLS_RSA_WITH_DES_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA, 
     1179                    PJ_TLS_RSA_WITH_DES_CBC_SHA, PJ_TLS_RSA_WITH_AES_256_CBC_SHA, 
    11801180                    PJ_FALSE, PJ_FALSE); 
    11811181    if (ret == 0) 
     
    11841184    PJ_LOG(3,("", "..echo test w/ client cert required but not provided")); 
    11851185    ret = echo_test(PJ_SSL_SOCK_PROTO_DEFAULT, PJ_SSL_SOCK_PROTO_DEFAULT,  
    1186                     TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA, 
     1186                    PJ_TLS_RSA_WITH_AES_256_CBC_SHA, PJ_TLS_RSA_WITH_AES_256_CBC_SHA, 
    11871187                    PJ_TRUE, PJ_FALSE); 
    11881188    if (ret == 0) 
     
    11911191    PJ_LOG(3,("", "..echo test w/ client cert required and provided")); 
    11921192    ret = echo_test(PJ_SSL_SOCK_PROTO_DEFAULT, PJ_SSL_SOCK_PROTO_DEFAULT,  
    1193                     TLS_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA, 
     1193                    PJ_TLS_RSA_WITH_AES_256_CBC_SHA, PJ_TLS_RSA_WITH_AES_256_CBC_SHA, 
    11941194                    PJ_TRUE, PJ_TRUE); 
    11951195    if (ret != 0) 
Note: See TracChangeset for help on using the changeset viewer.