--- snmplib/scapi.c.FCS 2001-10-01 09:52:49.000000000 +0000 +++ snmplib/scapi.c 2003-12-03 18:49:09.000000000 +0000 @@ -500,8 +500,8 @@ u_char pad_block[32]; /* bigger than anything I need */ u_char my_iv[32]; /* ditto */ int pad, plast, pad_size; - des_key_schedule key_sch; - des_cblock key_struct; + DES_key_schedule key_sch; + DES_cblock key_struct; DEBUGTRACE; @@ -589,16 +589,16 @@ if ( ISTRANSFORM(privtype, DESPriv) ) { memcpy(key_struct, key, sizeof(key_struct)); - (void) des_key_sched(&key_struct, key_sch); + (void) DES_key_sched(&key_struct, &key_sch); memcpy(my_iv, iv, ivlen); /* encrypt the data */ - des_ncbc_encrypt(plaintext, ciphertext, plast, key_sch, - (des_cblock *) my_iv, DES_ENCRYPT); + DES_ncbc_encrypt(plaintext, ciphertext, plast, &key_sch, + (DES_cblock *) my_iv, DES_ENCRYPT); if (pad > 0) { /* then encrypt the pad block */ - des_ncbc_encrypt(pad_block, ciphertext+plast, pad_size, - key_sch, (des_cblock *)my_iv, DES_ENCRYPT); + DES_ncbc_encrypt(pad_block, ciphertext+plast, pad_size, + &key_sch, (DES_cblock *)my_iv, DES_ENCRYPT); *ctlen = plast + pad_size; } else { *ctlen = plast; @@ -609,7 +609,7 @@ memset(my_iv, 0, sizeof(my_iv)); memset(pad_block, 0, sizeof(pad_block)); memset(key_struct, 0, sizeof(key_struct)); - memset(key_sch, 0, sizeof(key_sch)); + memset(&key_sch, 0, sizeof(key_sch)); return rval; } /* end sc_encrypt() */ @@ -668,8 +668,8 @@ int rval = SNMPERR_SUCCESS; u_char *my_iv[32]; - des_key_schedule key_sch; - des_cblock key_struct; + DES_key_schedule key_sch; + DES_cblock key_struct; u_int properlength, properlength_iv; @@ -712,17 +712,17 @@ memset(my_iv, 0, sizeof(my_iv)); if (ISTRANSFORM(privtype, DESPriv)) { memcpy(key_struct, key, sizeof(key_struct)); - (void) des_key_sched(&key_struct, key_sch); + (void) DES_key_sched(&key_struct, &key_sch); memcpy(my_iv, iv, ivlen); - des_cbc_encrypt(ciphertext, plaintext, ctlen, key_sch, - (des_cblock *) my_iv, DES_DECRYPT); + DES_cbc_encrypt(ciphertext, plaintext, ctlen, &key_sch, + (DES_cblock *) my_iv, DES_DECRYPT); *ptlen = ctlen; } /* exit cond */ sc_decrypt_quit: - memset(key_sch, 0, sizeof(key_sch)); + memset(&key_sch, 0, sizeof(key_sch)); memset(key_struct, 0, sizeof(key_struct)); memset(my_iv, 0, sizeof(my_iv)); return rval;