upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-05-28 04:35:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#10498 libldap: more const-correctness for OpenSSL 4

Browse source
This commit is contained in:
Simon Pichugin 2026-04-30 16:57:27 -07:00 committed by Howard Chu
parent 9e9e6b8c11
commit 75b624f475
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/libldap/tls_o.c
View file

@ -198,8 +198,8 @@ tlso_ca_list( char * bundle, char * dir, X509 *cert, STACK_OF(X509_NAME) *ca_lis
ldap_charray_free( dirs );
}
if ( cert ) {
X509_NAME *xn = X509_get_subject_name( cert );
xn = X509_NAME_dup( xn );
const X509_NAME *cxn = X509_get_subject_name( cert );
X509_NAME *xn = X509_NAME_dup( cxn );
if ( xn && ca_list ) {
sk_X509_NAME_push( ca_list, xn );
}
@ -924,7 +924,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *der_dn )
{
tlso_session *s = (tlso_session *)sess;
X509 *x;
X509_NAME *xn;
const X509_NAME *xn;
x = SSL_get_certificate( s );
@ -961,7 +961,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval *der_dn )
{
tlso_session *s = (tlso_session *)sess;
X509 *x = tlso_get_cert( s );
X509_NAME *xn;
const X509_NAME *xn;
if ( !x )
return LDAP_INVALID_CREDENTIALS;
@ -1037,7 +1037,7 @@ tlso_session_chkhost( LDAP *ld, tls_session *sess, const char *name_in )
if (chkSAN) {
i = X509_get_ext_by_NID(x, NID_subject_alt_name, -1);
if (i >= 0) {
X509_EXTENSION *ex;
const X509_EXTENSION *ex;
STACK_OF(GENERAL_NAME) *alt;
ex = X509_get_ext(x, i);
@ -1143,10 +1143,10 @@ tlso_session_chkhost( LDAP *ld, tls_session *sess, const char *name_in )
}
if (ret != LDAP_SUCCESS) {
X509_NAME *xn;
X509_NAME_ENTRY *ne;
const X509_NAME *xn;
const X509_NAME_ENTRY *ne;
ASN1_OBJECT *obj;
ASN1_STRING *cn = NULL;
const ASN1_STRING *cn = NULL;
char *cnstr;
int cnlen;
int navas;
@ -1742,8 +1742,8 @@ tlso_verify_cb( int ok, X509_STORE_CTX *ctx )
X509 *cert;
int errnum;
int errdepth;
X509_NAME *subject;
X509_NAME *issuer;
const X509_NAME *subject;
const X509_NAME *issuer;
char *sname;
char *iname;
char *certerr = NULL;

7
servers/slapd/overlays/autoca.c
View file

@ -44,9 +44,13 @@
#if OPENSSL_VERSION_NUMBER >= 0x10100000
#include <openssl/rsa.h>
#ifndef X509_get_notBefore
#define X509_get_notBefore(x) X509_getm_notBefore(x)
#endif
#ifndef X509_get_notAfter
#define X509_get_notAfter(x) X509_getm_notAfter(x)
#endif
#endif
#if OPENSSL_VERSION_MAJOR >= 3
#define BN_pseudo_rand(bn, bits, top, bottom) BN_rand(bn, bits, top, bottom)
@ -272,7 +276,8 @@ typedef struct genargs {
static int autoca_gencert( Operation *op, genargs *args )
{
X509_NAME *subj_name, *issuer_name;
X509_NAME *subj_name;
const X509_NAME *issuer_name;
X509 *subj_cert;
struct berval derdn;
unsigned char *pp;