-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleanup typing for password callbacks
Although this adds two more classes, removing type hacks is likely better. Also essentially removes the default password callback since right now I don't see where it is used. Will test further if anything bad happens.
- Loading branch information
Showing
4 changed files
with
646 additions
and
520 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // Generated by jextract | ||
|
|
||
| package org.apache.tomcat.util.openssl; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.VarHandle; | ||
| import java.nio.ByteOrder; | ||
| import java.lang.foreign.*; | ||
| import static java.lang.foreign.ValueLayout.*; | ||
|
|
||
| /** | ||
| * {@snippet lang=c : | ||
| * int (*PEM_read_bio_PrivateKey$cb)(char* buf,int size,int rwflag,void* userdata); | ||
| * } | ||
| */ | ||
| public interface PEM_read_bio_PrivateKey$cb { | ||
|
|
||
| int apply(MemorySegment buf, int size, int rwflag, MemorySegment userdata); | ||
|
|
||
| FunctionDescriptor $DESC = FunctionDescriptor.of( | ||
| openssl_h.C_INT, | ||
| openssl_h.C_POINTER, | ||
| openssl_h.C_INT, | ||
| openssl_h.C_INT, | ||
| openssl_h.C_POINTER | ||
| ); | ||
|
|
||
| MethodHandle UP$MH = openssl_h.upcallHandle(PEM_read_bio_PrivateKey$cb.class, "apply", $DESC); | ||
|
|
||
| static MemorySegment allocate(PEM_read_bio_PrivateKey$cb fi, Arena scope) { | ||
| return Linker.nativeLinker().upcallStub(UP$MH.bindTo(fi), $DESC, scope); | ||
| } | ||
|
|
||
| MethodHandle DOWN$MH = Linker.nativeLinker().downcallHandle($DESC); | ||
|
|
||
| static PEM_read_bio_PrivateKey$cb ofAddress(MemorySegment addr, Arena arena) { | ||
| MemorySegment symbol = addr.reinterpret(arena, null); | ||
| return (MemorySegment _buf, int _size, int _rwflag, MemorySegment _userdata) -> { | ||
| try { | ||
| return (int) DOWN$MH.invokeExact(symbol, _buf, _size, _rwflag, _userdata); | ||
| } catch (Throwable ex$) { | ||
| throw new AssertionError("should not reach here", ex$); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
65 changes: 65 additions & 0 deletions
65
java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // Generated by jextract | ||
|
|
||
| package org.apache.tomcat.util.openssl; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.VarHandle; | ||
| import java.nio.ByteOrder; | ||
| import java.lang.foreign.*; | ||
| import static java.lang.foreign.ValueLayout.*; | ||
|
|
||
| /** | ||
| * {@snippet lang=c : | ||
| * int (*PEM_read_bio_X509_AUX$cb)(char* buf,int size,int rwflag,void* userdata); | ||
| * } | ||
| */ | ||
| public interface PEM_read_bio_X509_AUX$cb { | ||
|
|
||
| int apply(MemorySegment buf, int size, int rwflag, MemorySegment userdata); | ||
|
|
||
| FunctionDescriptor $DESC = FunctionDescriptor.of( | ||
| openssl_h.C_INT, | ||
| openssl_h.C_POINTER, | ||
| openssl_h.C_INT, | ||
| openssl_h.C_INT, | ||
| openssl_h.C_POINTER | ||
| ); | ||
|
|
||
| MethodHandle UP$MH = openssl_h.upcallHandle(PEM_read_bio_X509_AUX$cb.class, "apply", $DESC); | ||
|
|
||
| static MemorySegment allocate(PEM_read_bio_X509_AUX$cb fi, Arena scope) { | ||
| return Linker.nativeLinker().upcallStub(UP$MH.bindTo(fi), $DESC, scope); | ||
| } | ||
|
|
||
| MethodHandle DOWN$MH = Linker.nativeLinker().downcallHandle($DESC); | ||
|
|
||
| static PEM_read_bio_X509_AUX$cb ofAddress(MemorySegment addr, Arena arena) { | ||
| MemorySegment symbol = addr.reinterpret(arena, null); | ||
| return (MemorySegment _buf, int _size, int _rwflag, MemorySegment _userdata) -> { | ||
| try { | ||
| return (int) DOWN$MH.invokeExact(symbol, _buf, _size, _rwflag, _userdata); | ||
| } catch (Throwable ex$) { | ||
| throw new AssertionError("should not reach here", ex$); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.