forked from cory/tildefriends
		
	OpenSSL 3.2.1, and some android SDK updates.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4821 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
		| @@ -1,5 +1,5 @@ | ||||
| /* | ||||
|  * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. | ||||
|  * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved. | ||||
|  * | ||||
|  * Licensed under the Apache License 2.0 (the "License").  You may not use | ||||
|  * this file except in compliance with the License.  You can obtain a copy | ||||
| @@ -65,16 +65,16 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, | ||||
| #   ifdef VPAES_ASM | ||||
| #    define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC) | ||||
| #   endif | ||||
| #   define HWAES_CAPABLE  (OPENSSL_ppccap_P & PPC_CRYPTO207) | ||||
| #   define HWAES_set_encrypt_key aes_p8_set_encrypt_key | ||||
| #   define HWAES_set_decrypt_key aes_p8_set_decrypt_key | ||||
| #   define HWAES_encrypt aes_p8_encrypt | ||||
| #   define HWAES_decrypt aes_p8_decrypt | ||||
| #   define HWAES_cbc_encrypt aes_p8_cbc_encrypt | ||||
| #   define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks | ||||
| #   define HWAES_xts_encrypt aes_p8_xts_encrypt | ||||
| #   define HWAES_xts_decrypt aes_p8_xts_decrypt | ||||
| #   if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) | ||||
| #    define HWAES_CAPABLE  (OPENSSL_ppccap_P & PPC_CRYPTO207) | ||||
| #    define HWAES_set_encrypt_key aes_p8_set_encrypt_key | ||||
| #    define HWAES_set_decrypt_key aes_p8_set_decrypt_key | ||||
| #    define HWAES_encrypt aes_p8_encrypt | ||||
| #    define HWAES_decrypt aes_p8_decrypt | ||||
| #    define HWAES_cbc_encrypt aes_p8_cbc_encrypt | ||||
| #    define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks | ||||
| #    define HWAES_xts_encrypt aes_p8_xts_encrypt | ||||
| #    define HWAES_xts_decrypt aes_p8_xts_decrypt | ||||
| #    define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300) | ||||
| #    define AES_GCM_ENC_BYTES 128 | ||||
| #    define AES_GCM_DEC_BYTES 128 | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| /* | ||||
|  * Generated by util/mkerr.pl DO NOT EDIT | ||||
|  * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. | ||||
|  * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. | ||||
|  * | ||||
|  * Licensed under the Apache License 2.0 (the "License").  You may not use | ||||
|  * this file except in compliance with the License.  You can obtain a copy | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| /* | ||||
|  * Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved. | ||||
|  * Copyright 2015-2024 The OpenSSL Project Authors. All Rights Reserved. | ||||
|  * | ||||
|  * Licensed under the Apache License 2.0 (the "License").  You may not use | ||||
|  * this file except in compliance with the License.  You can obtain a copy | ||||
| @@ -371,4 +371,21 @@ int ossl_x509_check_private_key(const EVP_PKEY *k, const EVP_PKEY *pkey); | ||||
|  | ||||
| int x509v3_add_len_value_uchar(const char *name, const unsigned char *value, | ||||
|                                size_t vallen, STACK_OF(CONF_VALUE) **extlist); | ||||
| /* Attribute addition functions not checking for duplicate attributes */ | ||||
| STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, | ||||
|                                                 X509_ATTRIBUTE *attr); | ||||
| STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, | ||||
|                                                        const ASN1_OBJECT *obj, | ||||
|                                                        int type, | ||||
|                                                        const unsigned char *bytes, | ||||
|                                                        int len); | ||||
| STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, | ||||
|                                                        int nid, int type, | ||||
|                                                        const unsigned char *bytes, | ||||
|                                                        int len); | ||||
| STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, | ||||
|                                                        const char *attrname, | ||||
|                                                        int type, | ||||
|                                                        const unsigned char *bytes, | ||||
|                                                        int len); | ||||
| #endif  /* OSSL_CRYPTO_X509_H */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user