|
Line
Link Here
|
| 0 |
-- a/pppd/Makefile.linux |
0 |
++ b/pppd/Makefile.linux |
|
Lines 155-161
Link Here
|
| 155 |
|
155 |
|
| 156 |
ifdef NEEDDES |
156 |
ifdef NEEDDES |
| 157 |
ifndef USE_CRYPT |
157 |
ifndef USE_CRYPT |
| 158 |
CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl |
158 |
CFLAGS += -I/usr/include/openssl |
| 159 |
NEEDCRYPTOLIB = y |
159 |
NEEDCRYPTOLIB = y |
| 160 |
else |
160 |
else |
| 161 |
CFLAGS += -DUSE_CRYPT=1 |
161 |
CFLAGS += -DUSE_CRYPT=1 |
| 162 |
-- a/pppd/eap-tls.c |
162 |
++ b/pppd/eap-tls.c |
|
Lines 278-284
Link Here
|
| 278 |
return e; |
278 |
return e; |
| 279 |
} |
279 |
} |
| 280 |
|
280 |
|
|
|
281 |
static int _transfer_pin_writer (UI *ui, UI_STRING *uis) |
| 282 |
{ |
| 283 |
PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui); |
| 284 |
UI_set_result(ui, uis, cb_data->password); |
| 285 |
return 1; |
| 286 |
}; |
| 281 |
|
287 |
|
|
|
288 |
static int _transfer_pin_stub (UI* ui) {return 1;}; |
| 289 |
static int _transfer_pin_stub_reader (UI *ui, UI_STRING *uis) {return 1;}; |
| 282 |
|
290 |
|
| 283 |
/* |
291 |
/* |
| 284 |
* Initialize the SSL stacks and tests if certificates, key and crl |
292 |
* Initialize the SSL stacks and tests if certificates, key and crl |
|
Lines 516-535
Link Here
|
| 516 |
{ |
524 |
{ |
| 517 |
UI_METHOD* transfer_pin = UI_create_method("transfer_pin"); |
525 |
UI_METHOD* transfer_pin = UI_create_method("transfer_pin"); |
| 518 |
|
526 |
|
| 519 |
int writer (UI *ui, UI_STRING *uis) |
527 |
UI_method_set_writer(transfer_pin, _transfer_pin_writer); |
| 520 |
{ |
528 |
UI_method_set_opener(transfer_pin, _transfer_pin_stub); |
| 521 |
PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui); |
529 |
UI_method_set_closer(transfer_pin, _transfer_pin_stub); |
| 522 |
UI_set_result(ui, uis, cb_data->password); |
530 |
UI_method_set_flusher(transfer_pin, _transfer_pin_stub); |
| 523 |
return 1; |
531 |
UI_method_set_reader(transfer_pin, _transfer_pin_stub_reader); |
| 524 |
}; |
|
|
| 525 |
int stub (UI* ui) {return 1;}; |
| 526 |
int stub_reader (UI *ui, UI_STRING *uis) {return 1;}; |
| 527 |
|
| 528 |
UI_method_set_writer(transfer_pin, writer); |
| 529 |
UI_method_set_opener(transfer_pin, stub); |
| 530 |
UI_method_set_closer(transfer_pin, stub); |
| 531 |
UI_method_set_flusher(transfer_pin, stub); |
| 532 |
UI_method_set_reader(transfer_pin, stub_reader); |
| 533 |
|
532 |
|
| 534 |
dbglog( "Using our private key '%s' in engine", pkey_identifier ); |
533 |
dbglog( "Using our private key '%s' in engine", pkey_identifier ); |
| 535 |
pkey = ENGINE_load_private_key(pkey_engine, pkey_identifier, transfer_pin, &cb_data); |
534 |
pkey = ENGINE_load_private_key(pkey_engine, pkey_identifier, transfer_pin, &cb_data); |
