Skip to content

[ms-go1.25-support] don't call ERR_clear_error before every OpenSSL call #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2025
Merged

[ms-go1.25-support] don't call ERR_clear_error before every OpenSSL call #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/mkcgo/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ func generateCHeader(src *mkcgo.Source, w io.Writer) {
fmt.Fprintf(w, "typedef void* %s;\n", mkcgoErrState)
fmt.Fprintf(w, "%s mkcgo_err_retrieve();\n", mkcgoErrState)
fmt.Fprintf(w, "void mkcgo_err_free(%s);\n", mkcgoErrState)
fmt.Fprintf(w, "void mkcgo_err_clear();\n\n")

// Add forward declarations for loader functions.
for _, tag := range src.Tags() {
Expand Down Expand Up @@ -392,7 +391,6 @@ func generateCFn(typedefs map[string]string, fn *mkcgo.Func, w io.Writer) {
}

fmt.Fprintf(w, "%s %s(%s) {\n", fn.Ret, fnCName(fn), fnCErrWrapperParams(fn, true))
fmt.Fprintf(w, "\tmkcgo_err_clear();\n") // clear any previous error
fmt.Fprintf(w, "\t%s _ret = _g_%s(%s);\n", fn.Ret, fn.ImportName(), fnToCArgs(fn, false, true))
errCond := "<= 0"
if fn.ErrCond != "" {
Expand Down
6 changes: 0 additions & 6 deletions internal/ossl/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ typedef struct ossl_err_state_st {
char *file[ERR_NUM_MAX];
} ossl_err_state;

// mkcgo_err_clear clears the error queue in OpenSSL.
void mkcgo_err_clear() {
// Clear the error queue.
_mkcgo_ERR_clear_error();
}

// mkcgo_err_retrieve retrieves the error state from OpenSSL.
// It returns a pointer to a mkcgo_err_state structure
// that contains the error codes, lines, and file names.
Expand Down
Loading
Loading