diff options
| author | kris <kris@FreeBSD.org> | 2000-11-13 02:20:29 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-11-13 02:20:29 +0000 |
| commit | 76c54c9ba38450a69a291e1a8616ef6e229043ef (patch) | |
| tree | c19c2ee5abe6e2e8f31ea9f0df8dc01f357bb10a /crypto/openssl/ssl/s2_srvr.c | |
| parent | f6480205844e67624afaf36e515671962f3ff825 (diff) | |
| download | FreeBSD-src-76c54c9ba38450a69a291e1a8616ef6e229043ef.zip FreeBSD-src-76c54c9ba38450a69a291e1a8616ef6e229043ef.tar.gz | |
Resolve conflicts, and garbage collect some local changes that are no
longer required
Diffstat (limited to 'crypto/openssl/ssl/s2_srvr.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_srvr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/s2_srvr.c b/crypto/openssl/ssl/s2_srvr.c index 51c70df..2f3ec61 100644 --- a/crypto/openssl/ssl/s2_srvr.c +++ b/crypto/openssl/ssl/s2_srvr.c @@ -900,7 +900,7 @@ static int request_certificate(SSL *s) EVP_VerifyUpdate(&ctx,ccd,SSL2_MIN_CERT_CHALLENGE_LENGTH); i=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL); - buf2=Malloc((unsigned int)i); + buf2=OPENSSL_malloc((unsigned int)i); if (buf2 == NULL) { SSLerr(SSL_F_REQUEST_CERTIFICATE,ERR_R_MALLOC_FAILURE); @@ -909,7 +909,7 @@ static int request_certificate(SSL *s) p2=buf2; i=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,&p2); EVP_VerifyUpdate(&ctx,buf2,(unsigned int)i); - Free(buf2); + OPENSSL_free(buf2); pkey=X509_get_pubkey(x509); if (pkey == NULL) goto end; |
