source: packages/ipv6/send/patches/006-openssl-1.0.0-compat.patch @ 25855

Last change on this file since 25855 was 25855, checked in by jow, 5 years ago

[packages] send: fix more OpenSSL 1.0.0 fallout

File size: 3.8 KB
  • include/cga_keyutils.h

    a b  
    4040 
    4141extern int cga_add_key(cga_ctx_t *, EVP_PKEY *, int, uint16_t); 
    4242extern EVP_PKEY *cga_der2key(uint8_t *, int ); 
    43 extern STACK *cga_der2keys(uint8_t *, int ); 
    44 extern void cga_free_keystack(STACK *); 
     43extern STACK_OF(GENERAL_NAME) *cga_der2keys(uint8_t *, int ); 
     44extern void cga_free_keystack(STACK_OF(GENERAL_NAME) *); 
    4545extern uint8_t *cga_key2der(EVP_PKEY *, int *); 
    4646extern int cga_load_cert(cga_ctx_t *, const char *); 
    4747extern int cga_load_key(cga_ctx_t *, const char *); 
  • libs/libcga/cga_keyutils.c

    a b cga_set_key(cga_ctx_t *cga, EVP_PKEY *k) 
    215215} 
    216216 
    217217void 
    218 cga_free_keystack(STACK *sk) 
     218cga_free_keystack(STACK_OF(GENERAL_NAME) *sk) 
    219219{ 
    220220        EVP_PKEY *k; 
    221221 
    cga_free_keystack(STACK *sk) 
    232232 * 
    233233 * Returns a stack of EVP_PKEYs on success. 
    234234 */ 
    235 STACK * 
     235STACK_OF(GENERAL_NAME) * 
    236236cga_der2keys(uint8_t *der, int dlen) 
    237237{ 
    238238        uint8_t *dk; 
    239239        EVP_PKEY *k; 
    240240        int klen, elen; 
    241241        uint16_t type; 
    242         STACK *sk; 
     242        STACK_OF(GENERAL_NAME) *sk; 
    243243 
    244244        if ((sk = sk_new_null()) == NULL) { 
    245245                APPLOG_NOMEM(); 
  • include/pkixip_ext.h

    a b extern int pkixip_add2stores_cert(X509 * 
    5454extern int pkixip_add2stores_file(const char *); 
    5555extern int pkixip_add_store(int *, int (*cmp)(X509_OBJECT **, X509_OBJECT **)); 
    5656extern void *pkixip_find_cert(void *, int); 
    57 extern STACK *pkixip_get_mychain(void); 
     57extern STACK_OF(GENERAL_NAME) *pkixip_get_mychain(void); 
    5858extern X509_STORE_CTX *pkixip_get_store_ctx(void); 
    5959extern int pkixip_has_ext(X509 *x); 
    6060extern X509 *pkixip_load_cert(const char *); 
  • libs/libpkixipext/x509.c

    a b X509V3_EXT_METHOD pkix_ip_ext_method = { 
    6262        i2v : (X509V3_EXT_I2V)i2v_IPAddrBlocks, 
    6363}; 
    6464 
    65 static STACK *stores[PKIXIP_MAX_STORES]; 
     65static STACK_OF(GENERAL_NAME) *stores[PKIXIP_MAX_STORES]; 
    6666static X509_STORE_CTX *ctx_bysubj; 
    6767static int next_store = 1; 
    6868static void *(*wrap_store_cert)(X509 *x); 
    6969static void (*trustanchor_cb)(X509 *x); 
    7070pthread_mutex_t stores_lock = PTHREAD_MUTEX_INITIALIZER; 
    7171 
    72 static STACK *mychain; 
     72static STACK_OF(GENERAL_NAME) *mychain; 
    7373 
    7474/* Lifted from openssl x509_lu.c */ 
    7575static int 
    pkixip_load_pkey(const char *f) 
    243243        return (pkey); 
    244244} 
    245245 
    246 static STACK * 
     246static STACK_OF(GENERAL_NAME) * 
    247247pkixip_get_store(int handle) 
    248248{ 
    249249        if (handle >= PKIXIP_MAX_STORES || handle < 0) { 
    pkixip_get_store(int handle) 
    257257void 
    258258pkixip_walk_store(int (*cb)(X509 *, void *), void *cookie, int handle) 
    259259{ 
    260         STACK *objs; 
     260        STACK_OF(GENERAL_NAME) *objs; 
    261261        int i; 
    262262        X509_OBJECT *xo; 
    263263 
    done: 
    282282void * 
    283283pkixip_find_cert(void *k, int handle) 
    284284{ 
    285         STACK *store; 
     285        STACK_OF(GENERAL_NAME) *store; 
    286286        int i; 
    287287        void *r = NULL; 
    288288 
    done: 
    305305/* Caller must hold stores_lock */ 
    306306static int 
    307307pkixip_do_add_store(int handle, int (*cmp)(X509_OBJECT **, X509_OBJECT **), 
    308     STACK *objs) 
     308    STACK_OF(GENERAL_NAME) *objs) 
    309309{ 
    310310        if (objs == NULL && (objs = sk_X509_OBJECT_new(cmp)) == NULL) { 
    311311                applog(LOG_CRIT, "no memory"); 
    done: 
    538538        return (r); 
    539539} 
    540540 
    541 STACK * 
     541STACK_OF(GENERAL_NAME) * 
    542542pkixip_get_mychain(void) 
    543543{ 
    544544        return (mychain); 
  • sendd/cpa.c

    a b next: 
    183183} 
    184184 
    185185static int 
    186 can_handle_cps(uint8_t *ops, int len, STACK *chain, X509 **x) 
     186can_handle_cps(uint8_t *ops, int len, STACK_OF(GENERAL_NAME) *chain, X509 **x) 
    187187{ 
    188188        int i, j, r = 0; 
    189189        X509_NAME *dn; 
    190190        X509 x509_s; 
    191191        X509_CINF cinf_s; 
    192         STACK *dchain; 
     192        STACK_OF(GENERAL_NAME) *dchain; 
    193193        STACK_OF(X509_NAME) *dns; 
    194194 
    195195        *x = NULL; 
    snd_handle_cps(struct sbuff *b, struct s 
    239239{ 
    240240        uint8_t *msg = sbuff_data(b); 
    241241        int len = b->len; 
    242         STACK *chain; 
     242        STACK_OF(GENERAL_NAME) *chain; 
    243243        X509 *x, *trx = NULL; 
    244244        int i, tot, olen; 
    245245        uint8_t *ops; 
Note: See TracBrowser for help on using the repository browser.