"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ssl/s3_lib.c" between
openssl-1.1.1o.tar.gz and openssl-1.1.1p.tar.gz

About: OpenSSL is a toolkit implementing the Transport Layer Security (TLS) protocols (including SSLv3) as well as a full-strength general purpose cryptographic library. Long Term Support (LTS) version (includes support for TLSv1.3).

s3_lib.c  (openssl-1.1.1o)	:	s3_lib.c  (openssl-1.1.1p)
skipping to change at line 3679		skipping to change at line 3679
case SSL_CTRL_BUILD_CERT_CHAIN:		case SSL_CTRL_BUILD_CERT_CHAIN:
return ssl_build_cert_chain(s, NULL, larg);		return ssl_build_cert_chain(s, NULL, larg);
case SSL_CTRL_SET_VERIFY_CERT_STORE:		case SSL_CTRL_SET_VERIFY_CERT_STORE:
return ssl_cert_set_cert_store(s->cert, parg, 0, larg);		return ssl_cert_set_cert_store(s->cert, parg, 0, larg);
case SSL_CTRL_SET_CHAIN_CERT_STORE:		case SSL_CTRL_SET_CHAIN_CERT_STORE:
return ssl_cert_set_cert_store(s->cert, parg, 1, larg);		return ssl_cert_set_cert_store(s->cert, parg, 1, larg);
		case SSL_CTRL_GET_VERIFY_CERT_STORE:
		return ssl_cert_get_cert_store(s->cert, parg, 0);
		case SSL_CTRL_GET_CHAIN_CERT_STORE:
		return ssl_cert_get_cert_store(s->cert, parg, 1);
case SSL_CTRL_GET_PEER_SIGNATURE_NID:		case SSL_CTRL_GET_PEER_SIGNATURE_NID:
if (s->s3->tmp.peer_sigalg == NULL)		if (s->s3->tmp.peer_sigalg == NULL)
return 0;		return 0;
*(int *)parg = s->s3->tmp.peer_sigalg->hash;		*(int *)parg = s->s3->tmp.peer_sigalg->hash;
return 1;		return 1;
case SSL_CTRL_GET_SIGNATURE_NID:		case SSL_CTRL_GET_SIGNATURE_NID:
if (s->s3->tmp.sigalg == NULL)		if (s->s3->tmp.sigalg == NULL)
return 0;		return 0;
*(int *)parg = s->s3->tmp.sigalg->hash;		*(int *)parg = s->s3->tmp.sigalg->hash;
skipping to change at line 3952		skipping to change at line 3958
case SSL_CTRL_BUILD_CERT_CHAIN:		case SSL_CTRL_BUILD_CERT_CHAIN:
return ssl_build_cert_chain(NULL, ctx, larg);		return ssl_build_cert_chain(NULL, ctx, larg);
case SSL_CTRL_SET_VERIFY_CERT_STORE:		case SSL_CTRL_SET_VERIFY_CERT_STORE:
return ssl_cert_set_cert_store(ctx->cert, parg, 0, larg);		return ssl_cert_set_cert_store(ctx->cert, parg, 0, larg);
case SSL_CTRL_SET_CHAIN_CERT_STORE:		case SSL_CTRL_SET_CHAIN_CERT_STORE:
return ssl_cert_set_cert_store(ctx->cert, parg, 1, larg);		return ssl_cert_set_cert_store(ctx->cert, parg, 1, larg);
		case SSL_CTRL_GET_VERIFY_CERT_STORE:
		return ssl_cert_get_cert_store(ctx->cert, parg, 0);
		case SSL_CTRL_GET_CHAIN_CERT_STORE:
		return ssl_cert_get_cert_store(ctx->cert, parg, 1);
/* A Thawte special :-) */		/* A Thawte special :-) */
case SSL_CTRL_EXTRA_CHAIN_CERT:		case SSL_CTRL_EXTRA_CHAIN_CERT:
if (ctx->extra_certs == NULL) {		if (ctx->extra_certs == NULL) {
if ((ctx->extra_certs = sk_X509_new_null()) == NULL) {		if ((ctx->extra_certs = sk_X509_new_null()) == NULL) {
SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_MALLOC_FAILURE);		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_MALLOC_FAILURE);
return 0;		return 0;
}		}
}		}
if (!sk_X509_push(ctx->extra_certs, (X509 *)parg)) {		if (!sk_X509_push(ctx->extra_certs, (X509 *)parg)) {
SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_MALLOC_FAILURE);		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_MALLOC_FAILURE);
End of changes. 2 change blocks.
0 lines changed or deleted		12 lines changed or added

---