提交 4588cb44 编写于 作者: R Rich Salz

Revert "Constify code about X509_VERIFY_PARAM"

This reverts commit 81f9ce1e.
Reviewed-by: NMatt Caswell <matt@openssl.org>
上级 780bbb96
...@@ -301,7 +301,7 @@ int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, ...@@ -301,7 +301,7 @@ int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
return 1; 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; return param->flags;
} }
...@@ -396,7 +396,7 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, ...@@ -396,7 +396,7 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
param->hostflags = flags; 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; return param->peername;
} }
......
...@@ -12,7 +12,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge ...@@ -12,7 +12,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge
unsigned long flags); unsigned long flags);
int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
unsigned long flags); 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_purpose(X509_VERIFY_PARAM *param, int purpose);
int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust); 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 ...@@ -37,7 +37,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge
const char *name, size_t namelen); const char *name, size_t namelen);
void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
unsigned int flags); 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, int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
const char *email, size_t emaillen); const char *email, size_t emaillen);
int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
......
...@@ -12,7 +12,7 @@ SSL server verification parameters ...@@ -12,7 +12,7 @@ SSL server verification parameters
int SSL_set1_host(SSL *s, const char *hostname); int SSL_set1_host(SSL *s, const char *hostname);
int SSL_add1_host(SSL *s, const char *hostname); int SSL_add1_host(SSL *s, const char *hostname);
void SSL_set_hostflags(SSL *s, unsigned int flags); 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 =head1 DESCRIPTION
......
...@@ -1493,7 +1493,7 @@ __owur int SSL_set_trust(SSL *s, int trust); ...@@ -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_set1_host(SSL *s, const char *hostname);
__owur int SSL_add1_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); void SSL_set_hostflags(SSL *s, unsigned int flags);
__owur int SSL_CTX_dane_enable(SSL_CTX *ctx); __owur int SSL_CTX_dane_enable(SSL_CTX *ctx);
......
...@@ -453,7 +453,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, ...@@ -453,7 +453,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
unsigned long flags); unsigned long flags);
int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
unsigned long flags); 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_purpose(X509_VERIFY_PARAM *param, int purpose);
int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust); int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); 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, ...@@ -470,7 +470,7 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
const char *name, size_t namelen); const char *name, size_t namelen);
void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
unsigned int flags); 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 *); void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);
int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
const char *email, size_t emaillen); const char *email, size_t emaillen);
......
...@@ -795,7 +795,7 @@ void SSL_set_hostflags(SSL *s, unsigned int flags) ...@@ -795,7 +795,7 @@ void SSL_set_hostflags(SSL *s, unsigned int flags)
X509_VERIFY_PARAM_set_hostflags(s->param, flags); X509_VERIFY_PARAM_set_hostflags(s->param, flags);
} }
const char *SSL_get0_peername(const SSL *s) const char *SSL_get0_peername(SSL *s)
{ {
return X509_VERIFY_PARAM_get0_peername(s->param); return X509_VERIFY_PARAM_get0_peername(s->param);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册