Skip to content

Commit 043290a

Browse files
authored
Merge pull request #39 from cyverse/redirect_ssl
Redirect ssl
2 parents b87cd29 + a5a392a commit 043290a

File tree

5 files changed

+289
-208
lines changed

5 files changed

+289
-208
lines changed

irods/connection/resource_server_connection.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@ func (conn *IRODSResourceServerConnection) Decrypt(iv []byte, source []byte, des
413413
}
414414

415415
sslConf := conn.controlConnection.account.SSLConfiguration
416-
417416
encryptionAlg := types.GetEncryptionAlgorithm(sslConf.EncryptionAlgorithm)
418417

419418
len, err := util.Decrypt(encryptionAlg, conn.controlConnection.sslSharedSecret, iv, source, dest)
@@ -431,7 +430,6 @@ func (conn *IRODSResourceServerConnection) Encrypt(iv []byte, source []byte, des
431430
}
432431

433432
sslConf := conn.controlConnection.account.SSLConfiguration
434-
435433
encryptionAlg := types.GetEncryptionAlgorithm(sslConf.EncryptionAlgorithm)
436434

437435
len, err := util.Encrypt(encryptionAlg, conn.controlConnection.sslSharedSecret, iv, source, dest)

0 commit comments

Comments
 (0)