Commit 4588cb44 authored by Rich Salz's avatar Rich Salz
Browse files

Revert "Constify code about X509_VERIFY_PARAM" 



This reverts commit 81f9ce1e.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 780bbb96

crypto/x509/x509_vpm.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, 
    return 1;

}



unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param)

unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param)

{

    return param->flags;

}
@@ -396,7 +396,7 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, 
    param->hostflags = flags;

}



const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param)

char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param)

{

    return param->peername;

}

doc/crypto/X509_VERIFY_PARAM_set_flags.pod

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge 
                                        unsigned long flags);

 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,

                                        unsigned long flags);

 unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);

 unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);



 int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);

 int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
@@ -37,7 +37,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge 
                                 const char *name, size_t namelen);

 void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,

                                      unsigned int flags);

 const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param);

 char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param);

 int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,

                                 const char *email, size_t emaillen);

 int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,

doc/ssl/SSL_set1_host.pod

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ SSL server verification parameters 
 int SSL_set1_host(SSL *s, const char *hostname);

 int SSL_add1_host(SSL *s, const char *hostname);

 void SSL_set_hostflags(SSL *s, unsigned int flags);

 const char *SSL_get0_peername(const SSL *s);

 const char *SSL_get0_peername(SSL *s);



=head1 DESCRIPTION

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ __owur int SSL_set_trust(SSL *s, int trust); 


__owur int SSL_set1_host(SSL *s, const char *hostname);

__owur int SSL_add1_host(SSL *s, const char *hostname);

__owur const char *SSL_get0_peername(const SSL *s);

__owur const char *SSL_get0_peername(SSL *s);

void SSL_set_hostflags(SSL *s, unsigned int flags);



__owur int SSL_CTX_dane_enable(SSL_CTX *ctx);

include/openssl/x509_vfy.h

+2 −2
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, 
                                unsigned long flags);

int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,

                                  unsigned long flags);

unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);

unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);

int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);

int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);

void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
@@ -470,7 +470,7 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, 
                                const char *name, size_t namelen);

void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,

                                     unsigned int flags);

const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *);

char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *);

void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);

int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,

                                 const char *email, size_t emaillen);