diff options
author | Chocobozzz <me@florianbigard.com> | 2022-07-12 10:54:21 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-07-12 12:08:12 +0200 |
commit | 5d7cb63ede7c4bba93954c0586f589ad9748d5ea (patch) | |
tree | 12856de40417d16ebe86c16a9febe7cc9f36091b /server/helpers/peertube-crypto.ts | |
parent | 0667dbaf268e05b5c9d22f662532e86a1233741c (diff) | |
download | PeerTube-5d7cb63ede7c4bba93954c0586f589ad9748d5ea.tar.gz PeerTube-5d7cb63ede7c4bba93954c0586f589ad9748d5ea.tar.zst PeerTube-5d7cb63ede7c4bba93954c0586f589ad9748d5ea.zip |
Add compat with openssl 3
Diffstat (limited to 'server/helpers/peertube-crypto.ts')
-rw-r--r-- | server/helpers/peertube-crypto.ts | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts index 1a7ee24a7..1d9cab2ce 100644 --- a/server/helpers/peertube-crypto.ts +++ b/server/helpers/peertube-crypto.ts | |||
@@ -5,7 +5,7 @@ import { cloneDeep } from 'lodash' | |||
5 | import { sha256 } from '@shared/extra-utils' | 5 | import { sha256 } from '@shared/extra-utils' |
6 | import { BCRYPT_SALT_SIZE, HTTP_SIGNATURE, PRIVATE_RSA_KEY_SIZE } from '../initializers/constants' | 6 | import { BCRYPT_SALT_SIZE, HTTP_SIGNATURE, PRIVATE_RSA_KEY_SIZE } from '../initializers/constants' |
7 | import { MActor } from '../types/models' | 7 | import { MActor } from '../types/models' |
8 | import { createPrivateKey, getPublicKey, promisify1, promisify2 } from './core-utils' | 8 | import { generateRSAKeyPairPromise, promisify1, promisify2 } from './core-utils' |
9 | import { jsonld } from './custom-jsonld-signature' | 9 | import { jsonld } from './custom-jsonld-signature' |
10 | import { logger } from './logger' | 10 | import { logger } from './logger' |
11 | 11 | ||
@@ -15,13 +15,10 @@ const bcryptHashPromise = promisify2<any, string | number, string>(hash) | |||
15 | 15 | ||
16 | const httpSignature = require('@peertube/http-signature') | 16 | const httpSignature = require('@peertube/http-signature') |
17 | 17 | ||
18 | async function createPrivateAndPublicKeys () { | 18 | function createPrivateAndPublicKeys () { |
19 | logger.info('Generating a RSA key...') | 19 | logger.info('Generating a RSA key...') |
20 | 20 | ||
21 | const { key } = await createPrivateKey(PRIVATE_RSA_KEY_SIZE) | 21 | return generateRSAKeyPairPromise(PRIVATE_RSA_KEY_SIZE) |
22 | const { publicKey } = await getPublicKey(key) | ||
23 | |||
24 | return { privateKey: key, publicKey } | ||
25 | } | 22 | } |
26 | 23 | ||
27 | // User password checks | 24 | // User password checks |