Merge in code from main trunk to BRANCH_engine.

This commit is contained in:
Richard Levitte
2000-06-08 11:00:37 +00:00
parent 5decfb7002
commit d44c7dcf00
280 changed files with 2808 additions and 2009 deletions

View File

@@ -200,7 +200,7 @@ bad:
goto end;
}
BIO_printf(out, "SPKAC=%s\n", spkstr);
Free(spkstr);
OPENSSL_free(spkstr);
ret = 0;
goto end;
}
@@ -271,6 +271,6 @@ end:
BIO_free(out);
BIO_free(key);
EVP_PKEY_free(pkey);
if(passin) Free(passin);
if(passin) OPENSSL_free(passin);
EXIT(ret);
}