47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
diff --git a/include/wvtripledes.h b/include/wvtripledes.h
|
|
index 185fe8a..a442e7a 100644
|
|
--- a/include/wvtripledes.h
|
|
+++ b/include/wvtripledes.h
|
|
@@ -70,11 +70,11 @@ protected:
|
|
|
|
private:
|
|
Mode mode;
|
|
- des_cblock key;
|
|
- des_key_schedule deskey1;
|
|
- des_key_schedule deskey2;
|
|
- des_key_schedule deskey3;
|
|
- des_cblock ivec; // initialization vector
|
|
+ DES_cblock key;
|
|
+ DES_key_schedule deskey1;
|
|
+ DES_key_schedule deskey2;
|
|
+ DES_key_schedule deskey3;
|
|
+ DES_cblock ivec; // initialization vector
|
|
int ivecoff; // current offset into initvec
|
|
};
|
|
|
|
--- a/crypto/wvx509.cc 2022-01-28 12:55:29.000000000 +0100
|
|
+++ b/crypto/wvx509.cc 2022-01-28 13:01:17.276681510 +0100
|
|
@@ -1446,19 +1446,19 @@
|
|
{
|
|
CHECK_CERT_EXISTS_SET("ski");
|
|
|
|
- ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new();
|
|
+ ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
|
|
ASN1_BIT_STRING *pk = cert->cert_info->key->public_key;
|
|
unsigned char pkey_dig[EVP_MAX_MD_SIZE];
|
|
unsigned int diglen;
|
|
|
|
EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
|
|
|
|
- M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
|
|
+ ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
|
|
X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0,
|
|
oct);
|
|
X509_add_ext(cert, ext, -1);
|
|
X509_EXTENSION_free(ext);
|
|
- M_ASN1_OCTET_STRING_free(oct);
|
|
+ ASN1_OCTET_STRING_free(oct);
|
|
}
|
|
|
|
|